From 5adab75324b8bbb9cd2422a77751df30ebcbbe85 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 5 Feb 2020 02:17:00 +0400 Subject: [PATCH] Revert "format: organize imports" --- Mage/src/main/java/mage/ConditionalMana.java | 10 +-- Mage/src/main/java/mage/MageInt.java | 6 +- Mage/src/main/java/mage/MageObject.java | 11 +-- Mage/src/main/java/mage/MageObjectImpl.java | 15 +--- .../main/java/mage/MageObjectReference.java | 9 +- Mage/src/main/java/mage/Mana.java | 4 +- .../main/java/mage/abilities/Abilities.java | 1 - .../java/mage/abilities/AbilitiesImpl.java | 15 +--- .../src/main/java/mage/abilities/Ability.java | 14 ++- .../main/java/mage/abilities/AbilityImpl.java | 34 ++------ .../java/mage/abilities/ActivatedAbility.java | 1 - .../mage/abilities/ActivatedAbilityImpl.java | 1 - .../java/mage/abilities/ActivationInfo.java | 1 - .../abilities/DelayedTriggeredAbilities.java | 4 +- Mage/src/main/java/mage/abilities/Mode.java | 6 +- Mage/src/main/java/mage/abilities/Modes.java | 10 +-- .../java/mage/abilities/PlayLandAbility.java | 1 - .../java/mage/abilities/SpellAbility.java | 8 +- .../mage/abilities/StateTriggeredAbility.java | 4 +- .../mage/abilities/TriggeredAbilities.java | 8 +- .../java/mage/abilities/TriggeredAbility.java | 1 - .../mage/abilities/TriggeredAbilityImpl.java | 6 +- ...ctivateOnlyByOpponentActivatedAbility.java | 2 +- .../AttackedByCreatureTriggeredAbility.java | 1 - .../common/AttacksAllTriggeredAbility.java | 1 - .../common/AttacksAloneTriggeredAbility.java | 3 +- .../AttacksAttachedTriggeredAbility.java | 1 - .../common/AttacksTriggeredAbility.java | 1 - .../AttacksWithCreaturesTriggeredAbility.java | 1 - ...BecomesTappedAttachedTriggeredAbility.java | 2 +- .../BecomesTappedSourceTriggeredAbility.java | 2 +- ...BecomesTargetAttachedTriggeredAbility.java | 2 +- ...TargetControllerSpellTriggeredAbility.java | 2 +- .../BeginningOfEndStepTriggeredAbility.java | 1 - ...nningOfPostCombatMainTriggeredAbility.java | 4 + .../BeginningOfUpkeepTriggeredAbility.java | 4 +- ...mesBlockedByOneOrMoreTriggeredAbility.java | 5 +- .../common/BlocksTriggeredAbility.java | 2 +- .../common/CanBeYourCommanderAbility.java | 1 - .../abilities/common/CantBlockAbility.java | 2 +- ...erAssignCombatDamageToBlockersAbility.java | 5 +- .../ControllerDivideCombatDamageAbility.java | 5 +- ...sPermanentsControllerTriggeredAbility.java | 2 +- ...leOrDiscardControllerTriggeredAbility.java | 2 +- .../DamageAsThoughNotBlockedAbility.java | 5 +- ...mbatDamageToACreatureTriggeredAbility.java | 2 +- ...ealsDamageToACreatureTriggeredAbility.java | 2 +- .../DealtDamageAttachedTriggeredAbility.java | 3 +- .../EntersBattlefieldAllTriggeredAbility.java | 1 - ...ttlefieldOrAttacksAllTriggeredAbility.java | 1 - .../abilities/common/EscapesWithAbility.java | 8 +- .../common/FetchLandActivatedAbility.java | 10 +-- ...rstSpellOpponentsTurnTriggeredAbility.java | 4 +- .../LeavesBattlefieldAllTriggeredAbility.java | 1 - .../mage/abilities/common/LicidAbility.java | 1 - .../mage/abilities/common/PassAbility.java | 1 - ...ceIfCastAtInstantTimeTriggeredAbility.java | 2 +- ...anctuaryInterveningIfTriggeredAbility.java | 2 +- ...ureSpellCastOnlyWithOathbreakerEffect.java | 4 +- .../common/SimpleActivatedAbility.java | 2 +- .../common/SimpleTriggeredAbility.java | 2 +- .../common/UnattachedTriggeredAbility.java | 2 +- .../WhileSearchingPlayFromLibraryAbility.java | 5 +- ...LeaveReturnExiledToBattlefieldAbility.java | 1 - .../delayed/PactDelayedTriggeredAbility.java | 2 +- .../condition/CompoundCondition.java | 6 +- .../mage/abilities/condition/Condition.java | 4 +- .../mage/abilities/condition/OrCondition.java | 1 - .../condition/common/AdamantCondition.java | 4 +- .../condition/common/AddendumCondition.java | 6 +- .../common/CardsInAnyLibraryCondition.java | 6 +- .../common/CardsInHandCondition.java | 2 +- .../common/CardsInOpponentGraveCondition.java | 4 +- .../common/CommanderInPlayCondition.java | 4 +- ...ontrolsCreatureGreatestPowerCondition.java | 1 - ...olsCreatureGreatestToughnessCondition.java | 1 - ...ControlsPermanentGreatestCMCCondition.java | 1 - ...ermanentsComparedToOpponentsCondition.java | 1 - .../common/CreatureCountCondition.java | 1 - .../common/DealtDamageToAnOpponent.java | 1 - .../DefendingPlayerControlsCondition.java | 1 - .../common/DevouredCreaturesCondition.java | 2 +- .../common/EnchantedSourceCondition.java | 1 - .../common/EquippedHasSupertypeCondition.java | 4 +- .../EquippedMultipleSourceCondition.java | 4 +- .../common/EquippedSourceCondition.java | 6 +- .../condition/common/FerociousCondition.java | 2 +- .../common/MainPhaseStackEmptyCondition.java | 2 +- .../condition/common/MorbidCondition.java | 1 + ...MoreCardsInHandThanOpponentsCondition.java | 4 +- .../condition/common/NotMyTurnCondition.java | 1 - .../OathbreakerOnBattlefieldCondition.java | 10 +-- .../common/OneOpponentCondition.java | 4 +- .../common/OpponentControlsMoreCondition.java | 1 - .../OpponentControlsPermanentCondition.java | 2 +- .../common/OpponentHasMoreLifeCondition.java | 4 +- .../common/OpponentLostLifeCondition.java | 6 +- .../common/PermanentHasCounterCondition.java | 8 +- .../SourceHasRemainedInSameZoneCondition.java | 1 - ...nBattlefieldControlUnchangedCondition.java | 1 - ...ceOnBattlefieldOrCommandZoneCondition.java | 1 - .../SourceTappedBeforeUntapStepCondition.java | 4 +- .../SourceTargetsPermanentCondition.java | 4 +- .../condition/common/SpectacleCondition.java | 6 +- .../condition/common/SurgedCondition.java | 6 +- .../condition/common/SuspendedCondition.java | 2 +- .../common/XorLessLifeCondition.java | 4 +- .../common/YouGainedLifeCondition.java | 2 +- .../costs/AlternativeCostSourceAbility.java | 4 +- .../mage/abilities/costs/CompositeCost.java | 1 - .../main/java/mage/abilities/costs/Cost.java | 6 +- .../java/mage/abilities/costs/CostImpl.java | 1 - .../java/mage/abilities/costs/CostsImpl.java | 1 - .../java/mage/abilities/costs/OrCost.java | 1 - .../abilities/costs/VariableCostImpl.java | 4 +- .../costs/common/ControlPermanentCost.java | 6 +- .../costs/common/CyclingDiscardCost.java | 1 - .../costs/common/DiscardHandCost.java | 1 - .../costs/common/DiscardSourceCost.java | 4 +- .../costs/common/DiscardTargetCost.java | 1 - .../common/DynamicValueGenericManaCost.java | 4 +- .../costs/common/ExertSourceCost.java | 1 - .../costs/common/ExileFromGraveCost.java | 1 - .../costs/common/ExileFromHandCost.java | 8 +- .../costs/common/ExileFromStackCost.java | 1 - .../common/ExileFromTopOfLibraryCost.java | 1 - ...OpponentsCardFromExileToGraveyardCost.java | 1 - .../costs/common/ExileSourceCost.java | 1 - .../common/ExileSourceFromGraveCost.java | 1 - .../costs/common/ExileTargetCost.java | 1 - .../common/ExileTopCardOfGraveyardCost.java | 1 - .../ExileTopCreatureCardOfGraveyardCost.java | 1 - .../costs/common/GainLifeOpponentCost.java | 1 - .../costs/common/GainLifePlayersCost.java | 1 - .../abilities/costs/common/PayEnergyCost.java | 1 - .../abilities/costs/common/PayLifeCost.java | 4 +- .../costs/common/PayLoyaltyCost.java | 4 +- .../costs/common/PayVariableLoyaltyCost.java | 1 - .../PutCardFromHandOnTopOfLibraryCost.java | 4 +- .../costs/common/PutCountersSourceCost.java | 1 - .../PutSourceOnBottomOwnerLibraryCost.java | 1 - ...utTopCardOfYourLibraryToGraveyardCost.java | 1 - .../costs/common/RemoveCounterCost.java | 8 +- .../common/RemoveCountersSourceCost.java | 1 - .../RemoveVariableCountersTargetCost.java | 1 - ...rnToHandChosenControlledPermanentCost.java | 1 - ...ReturnToHandFromBattlefieldSourceCost.java | 1 - .../common/ReturnToHandFromGraveyardCost.java | 1 - .../RevealHandSourceControllerCost.java | 1 - .../common/RevealSecretOpponentCost.java | 4 +- .../common/RevealSourceFromYourHandCost.java | 1 - .../common/RevealTargetFromHandCost.java | 1 - .../costs/common/SacrificeAllCost.java | 1 - .../costs/common/SacrificeAttachedCost.java | 1 - .../costs/common/SacrificeSourceCost.java | 1 - .../costs/common/SacrificeTargetCost.java | 8 +- .../costs/common/TapAttachedCost.java | 1 - .../abilities/costs/common/TapSourceCost.java | 1 - .../abilities/costs/common/TapTargetCost.java | 4 +- .../abilities/costs/common/UnattachCost.java | 1 - .../costs/common/UntapSourceCost.java | 1 - .../costs/common/UntapTargetCost.java | 12 +-- .../abilities/costs/mana/HybridManaCost.java | 1 - .../mage/abilities/costs/mana/ManaCost.java | 1 - .../abilities/costs/mana/ManaCostImpl.java | 8 +- .../mage/abilities/costs/mana/ManaCosts.java | 8 +- .../abilities/costs/mana/ManaCostsImpl.java | 9 +- .../abilities/costs/mana/ManaSymbols.java | 9 +- .../costs/mana/MonoHybridManaCost.java | 6 +- .../ConditionalContinuousEffect.java | 19 ++-- .../ConditionalGainActivatedAbility.java | 1 - ...ditionalInterveningIfTriggeredAbility.java | 4 +- .../decorator/ConditionalManaEffect.java | 1 - .../ConditionalRequirementEffect.java | 4 +- .../ConditionalTriggeredAbility.java | 4 +- .../dynamicvalue/AdditiveDynamicValue.java | 1 - .../abilities/dynamicvalue/DynamicValue.java | 4 +- .../common/AttackingFilterCreatureCount.java | 1 - .../common/AuraAttachedCount.java | 1 - .../common/CardTypesInGraveyardCount.java | 4 +- .../common/CardsInAllGraveyardsCount.java | 1 - .../common/CardsInAllHandsCount.java | 4 +- .../common/ColorsOfManaSpentToCastCount.java | 1 - .../common/ControllerGotLifeCount.java | 1 - .../dynamicvalue/common/DevotionCount.java | 10 +-- .../dynamicvalue/common/DomainValue.java | 4 +- .../common/EquipmentAttachedCount.java | 6 +- .../dynamicvalue/common/GetKickerXValue.java | 4 + ...estPowerAmongControlledCreaturesValue.java | 1 + .../common/OpponentsLostLifeCount.java | 4 +- .../common/OpponentsPoisonCountersCount.java | 6 +- .../dynamicvalue/common/ParleyCount.java | 1 - ...PermanentsTargetOpponentControlsCount.java | 1 - ...anentsYouOwnThatOpponentsControlCount.java | 6 +- .../common/SourcePermanentToughnessValue.java | 4 +- .../dynamicvalue/common/StaticValue.java | 8 +- .../common/TargetPermanenToughnessValue.java | 4 +- .../effects/ApplyCountersEffect.java | 2 +- .../abilities/effects/AsThoughEffect.java | 1 - .../abilities/effects/AsThoughEffectImpl.java | 4 +- .../abilities/effects/AsThoughManaEffect.java | 1 - .../effects/AuraReplacementEffect.java | 10 +-- .../abilities/effects/ContinuousEffect.java | 10 +-- .../effects/ContinuousEffectImpl.java | 19 +--- .../abilities/effects/ContinuousEffects.java | 42 ++------- .../effects/ContinuousEffectsList.java | 13 +-- .../java/mage/abilities/effects/Effect.java | 6 +- .../mage/abilities/effects/EffectImpl.java | 8 +- .../java/mage/abilities/effects/Effects.java | 4 +- .../PlaneswalkerRedirectionEffect.java | 1 - .../abilities/effects/RequirementEffect.java | 1 - .../abilities/effects/RestrictionEffect.java | 1 - .../common/AddCombatAndMainPhaseEffect.java | 1 - .../common/AddContinuousEffectToGame.java | 2 +- .../effects/common/AmplifyEffect.java | 6 +- ...AttacksIfAbleTargetPlayerSourceEffect.java | 4 +- .../CanBlockAsThoughtItHadShadowEffect.java | 4 +- .../common/CantBeRegeneratedSourceEffect.java | 1 - .../CastCardFromOutsideTheGameEffect.java | 1 - ...getOfTargetSpellAbilityToSourceEffect.java | 1 - .../common/ChooseCreatureTypeEffect.java | 1 - .../common/ChooseExpansionSetEffect.java | 1 - .../effects/common/ChooseLandTypeEffect.java | 4 +- .../effects/common/ChooseModeEffect.java | 1 - .../effects/common/CipherEffect.java | 5 +- .../abilities/effects/common/ClashEffect.java | 4 +- .../abilities/effects/common/CopyEffect.java | 14 +-- .../effects/common/CopyPermanentEffect.java | 4 +- .../CopySpellForEachItCouldTargetEffect.java | 11 +-- .../effects/common/CopyTokenEffect.java | 8 +- .../common/CouncilsDilemmaVoteEffect.java | 1 - ...etAndSearchGraveyardHandLibraryEffect.java | 1 - .../effects/common/CounterTargetEffect.java | 1 - .../common/CreateTokenCopyTargetEffect.java | 14 ++- .../effects/common/CreateTokenEffect.java | 8 +- .../common/CreateTokenTargetEffect.java | 1 + .../DamageAllControlledTargetEffect.java | 2 +- .../effects/common/DamageAllEffect.java | 1 - .../common/DamageControllerEffect.java | 2 +- .../common/DamageEverythingEffect.java | 6 +- .../effects/common/DamageMultiEffect.java | 8 +- .../effects/common/DamagePlayersEffect.java | 4 +- .../effects/common/DamageSelfEffect.java | 2 +- .../effects/common/DamageTargetEffect.java | 4 +- .../DestroyAllAttachedEquipmentEffect.java | 1 - .../DestroyAllControlledTargetEffect.java | 2 +- .../effects/common/DestroyEquippedEffect.java | 1 - .../common/DestroyMultiTargetEffect.java | 3 +- .../effects/common/DestroyTargetEffect.java | 4 +- .../effects/common/DetainAllEffect.java | 8 +- .../effects/common/DetainTargetEffect.java | 4 +- .../effects/common/DevourEffect.java | 10 +-- .../effects/common/DoIfCostPaid.java | 4 +- .../common/DoUnlessAnyPlayerPaysEffect.java | 4 +- ...nControllersNextUntapStepTargetEffect.java | 1 - ...tapInControllersUntapStepTargetEffect.java | 1 - .../effects/common/DrawCardAllEffect.java | 1 - .../effects/common/DrawCardTargetEffect.java | 1 - ...attlefieldPayCostOrPutGraveyardEffect.java | 1 - ...dUnderControlOfOpponentOfChoiceEffect.java | 3 +- .../EntersBattlefieldWithXCountersEffect.java | 8 +- .../abilities/effects/common/EpicEffect.java | 1 - .../common/ExileAdventureSpellEffect.java | 4 +- .../effects/common/ExileAllEffect.java | 3 +- ...eCardFromOwnGraveyardControllerEffect.java | 4 +- .../common/ExileFromZoneTargetEffect.java | 1 - .../ExileGraveyardAllPlayersEffect.java | 1 - .../ExileGraveyardAllTargetPlayerEffect.java | 1 - .../effects/common/ExileSourceEffect.java | 1 - .../common/ExileSourceUnlessPaysEffect.java | 1 - ...etAndSearchGraveyardHandLibraryEffect.java | 1 - .../effects/common/ExileTargetEffect.java | 1 - .../common/ExileTargetForSourceEffect.java | 8 +- .../effects/common/FightTargetsEffect.java | 4 +- .../effects/common/GainLifeEffect.java | 2 +- .../effects/common/GainLifeTargetEffect.java | 6 +- .../effects/common/GetEmblemEffect.java | 1 - .../common/GetEmblemTargetPlayerEffect.java | 4 +- .../effects/common/HideawayPlayEffect.java | 6 +- .../effects/common/ImprintTargetEffect.java | 2 +- .../LookLibraryAndPickControllerEffect.java | 8 +- ...ControlOnOtherPlayersControllerEffect.java | 2 +- .../LoseLifeSourceControllerEffect.java | 2 +- .../LoseLifeTargetControllerEffect.java | 4 +- .../effects/common/LoseLifeTargetEffect.java | 1 - .../abilities/effects/common/ManaEffect.java | 6 +- .../abilities/effects/common/MeldEffect.java | 1 - .../abilities/effects/common/PassEffect.java | 2 +- .../effects/common/PhaseOutAllEffect.java | 1 - .../effects/common/PhaseOutTargetEffect.java | 1 - ...PreventAllDamageByAllPermanentsEffect.java | 3 +- .../common/PreventAllDamageToAllEffect.java | 4 +- ...PreventAllDamageToAndByAttachedEffect.java | 2 +- .../PreventCombatDamageToSourceEffect.java | 2 +- .../common/PreventDamageToSourceEffect.java | 3 +- .../common/PreventDamageToTargetEffect.java | 2 +- ...reventDamageToTargetMultiAmountEffect.java | 8 +- .../common/PutOnLibraryTargetEffect.java | 10 +-- ...ardOfLibraryIntoGraveEachPlayerEffect.java | 1 - .../common/RegenerateAttachedEffect.java | 1 - .../common/RegenerateSourceEffect.java | 4 +- .../common/RegenerateTargetEffect.java | 1 - .../RemoveDelayedTriggeredAbilityEffect.java | 3 +- .../common/RemoveFromCombatTargetEffect.java | 1 - .../common/RemoveSpecialActionEffect.java | 3 +- ...OpponentCardsInHandWithSelectedEffect.java | 2 - .../ReturnCreaturesFromExileEffect.java | 1 - .../effects/common/ReturnFromExileEffect.java | 1 - .../ReturnFromExileForSourceEffect.java | 3 +- ...romGraveyardToBattlefieldTargetEffect.java | 8 +- ...tlefieldUnderOwnerControlTargetEffect.java | 4 +- ...ttlefieldUnderYourControlSourceEffect.java | 1 - ...ttlefieldUnderYourControlTargetEffect.java | 4 +- .../common/ReturnToHandAttachedEffect.java | 2 +- .../ReturnToHandFromBattlefieldAllEffect.java | 1 - .../ReturnToHandFromGraveyardAllEffect.java | 1 - .../common/ReturnToHandTargetEffect.java | 8 +- .../RevealHandSourceControllerEffect.java | 1 + .../RevealLibraryPutIntoHandEffect.java | 1 - .../effects/common/RollPlanarDieEffect.java | 1 - .../effects/common/SacrificeAllEffect.java | 8 +- .../effects/common/SacrificeEffect.java | 1 - .../common/SacrificeEquippedEffect.java | 1 - .../common/SacrificeOpponentsEffect.java | 1 - .../SacrificeOpponentsUnlessPayEffect.java | 8 +- .../SacrificeSourceUnlessPaysEffect.java | 4 +- .../effects/common/SacrificeTargetEffect.java | 1 - .../common/SetPlayerLifeAllEffect.java | 1 - .../common/ShuffleHandGraveyardAllEffect.java | 1 - ...leIntoLibraryGraveOfSourceOwnerEffect.java | 1 - .../SkipNextDrawStepControllerEffect.java | 1 + .../common/SkipNextPlayerUntapStepEffect.java | 4 +- .../effects/common/TapAllEffect.java | 2 +- .../TapAllTargetPlayerControlsEffect.java | 1 - .../effects/common/TapTargetEffect.java | 1 - .../common/TurnFaceUpTargetEffect.java | 1 - .../common/UnlessPaysDelayedEffect.java | 1 - .../common/UntapAllLandsControllerEffect.java | 2 +- .../common/UntapAllThatAttackedEffect.java | 2 +- .../effects/common/UntapEnchantedEffect.java | 2 +- .../effects/common/UntapLandsEffect.java | 1 - .../effects/common/UntapTargetEffect.java | 4 +- .../abilities/effects/common/WishEffect.java | 6 +- .../PlayFromNotOwnHandZoneAllEffect.java | 1 - .../PlayFromNotOwnHandZoneTargetEffect.java | 1 - ...fAbleTargetRandomOpponentSourceEffect.java | 8 +- ...kAsThoughItDidntHaveDefenderAllEffect.java | 4 +- ...ThoughItDidntHaveDefenderSourceEffect.java | 1 - ...ThoughItDidntHaveDefenderTargetEffect.java | 1 - .../CantAttackControllerAttachedEffect.java | 4 +- ...CantAttackIfDefenderControlsPermanent.java | 4 +- ...ttackUnlessDefenderControllsPermanent.java | 4 +- .../common/combat/CantAttackYouAllEffect.java | 4 +- .../common/combat/CantAttackYouEffect.java | 4 +- .../CantAttackYouOrPlaneswalkerAllEffect.java | 4 +- .../CantBeBlockedByAllTargetEffect.java | 4 +- .../CantBeBlockedByMoreThanOneAllEffect.java | 6 +- ...antBeBlockedByMoreThanOneSourceEffect.java | 6 +- .../combat/CantBeBlockedByOneAllEffect.java | 4 +- .../combat/CantBeBlockedByOneEffect.java | 4 +- .../CantBeBlockedByOneTargetEffect.java | 1 - .../combat/CantBlockAttachedEffect.java | 4 +- .../MustBeBlockedByAllAttachedEffect.java | 1 - .../MustBeBlockedByAllSourceEffect.java | 3 +- .../MustBeBlockedByAllTargetEffect.java | 1 - ...MustBeBlockedByAtLeastOneSourceEffect.java | 1 - ...MustBeBlockedByAtLeastOneTargetEffect.java | 1 - .../MustBeBlockedByTargetSourceEffect.java | 1 - ...itiesAnyTimeYouCouldCastInstantEffect.java | 1 - .../AddCardColorAttachedEffect.java | 6 +- .../AddCardSubTypeTargetEffect.java | 6 +- .../continuous/AddCardSubtypeAllEffect.java | 7 +- .../AddCardSubtypeAttachedEffect.java | 7 +- .../AddCardSuperTypeAttachedEffect.java | 8 +- .../continuous/AddCardTypeAttachedEffect.java | 7 +- .../continuous/AddCardTypeSourceEffect.java | 8 +- .../continuous/AddCardTypeTargetEffect.java | 1 - .../continuous/AddChosenSubtypeEffect.java | 6 +- .../BecomesAllBasicsControlledEffect.java | 17 +--- .../BecomesBasicLandEnchantedEffect.java | 22 ++--- .../BecomesBasicLandTargetEffect.java | 30 +++---- .../BecomesBlackZombieAdditionEffect.java | 6 +- .../continuous/BecomesColorAllEffect.java | 9 +- .../continuous/BecomesColorTargetEffect.java | 1 - .../continuous/BecomesCreatureAllEffect.java | 14 +-- .../BecomesCreatureAttachedEffect.java | 8 +- ...chedWithActivatedAbilityOrSpellEffect.java | 8 +- .../BecomesCreatureIfVehicleEffect.java | 7 +- .../BecomesCreatureSourceEffect.java | 8 +- .../BecomesCreatureTargetEffect.java | 12 +-- .../BecomesCreatureTypeTargetEffect.java | 10 +-- .../BecomesFaceDownCreatureAllEffect.java | 1 - .../BecomesFaceDownCreatureEffect.java | 1 - .../continuous/BecomesSubtypeAllEffect.java | 6 +- .../common/continuous/BoostAllEffect.java | 1 - .../continuous/BoostControlledEffect.java | 1 - .../continuous/BoostEquippedEffect.java | 8 +- .../continuous/BoostOpponentsEffect.java | 8 +- .../common/continuous/BoostSourceEffect.java | 3 +- .../BoostSourceWhileControlsEffect.java | 6 +- .../common/continuous/BoostTargetEffect.java | 6 +- .../continuous/CantGainLifeAllEffect.java | 1 - .../continuous/CantGainLifeTargetEffect.java | 1 - .../CastAsThoughItHadFlashAllEffect.java | 1 - .../CastAsThoughItHadFlashSourceEffect.java | 1 - ...stFromHandWithoutPayingManaCostEffect.java | 10 +-- .../CommanderManaReplacementEffect.java | 1 - .../CommanderReplacementEffect.java | 6 +- .../ExchangeControlTargetEffect.java | 1 - .../continuous/GainAbilityAllEffect.java | 16 ++-- .../continuous/GainAbilityAttachedEffect.java | 6 +- .../GainAbilityControlledEffect.java | 14 ++- .../GainAbilityControllerEffect.java | 4 +- .../continuous/GainAbilityTargetEffect.java | 12 +-- .../continuous/GainControlAllEffect.java | 1 - .../continuous/GainControlTargetEffect.java | 1 - .../GainProtectionFromTypeTargetEffect.java | 2 +- .../continuous/LoseAbilityAllEffect.java | 1 - .../continuous/LoseAbilityAttachedEffect.java | 9 +- ...seAbilityOrAnotherAbilityTargetEffect.java | 1 - .../continuous/LoseAbilityTargetEffect.java | 1 - .../LoseAllAbilitiesTargetEffect.java | 10 +-- .../LoseAllCreatureTypesTargetEffect.java | 6 +- .../LoseArtifactTypeTargetEffect.java | 12 +-- .../LoseCreatureTypeSourceEffect.java | 7 +- .../MaximumHandSizeControllerEffect.java | 1 - .../continuous/PlayTheTopCardEffect.java | 4 +- .../PlayWithHandRevealedEffect.java | 1 - .../PlayWithTheTopCardRevealedEffect.java | 4 +- .../SetCardColorAttachedEffect.java | 6 +- .../SetCardSubtypeAttachedEffect.java | 7 +- .../SetPowerToughnessAllEffect.java | 1 - .../SetPowerToughnessTargetEffect.java | 4 +- .../SwitchPowerToughnessAllEffect.java | 1 - .../SwitchPowerToughnessTargetEffect.java | 6 +- ...DuringEachOtherPlayersUntapStepEffect.java | 6 +- ...DuringEachOtherPlayersUntapStepEffect.java | 6 +- .../cost/CastWithoutPayingManaCostEffect.java | 3 +- .../cost/CommanderCostModification.java | 4 +- .../cost/CostModificationEffectImpl.java | 6 +- .../cost/SpellsCostReductionAllEffect.java | 1 - .../SpellsCostReductionControllerEffect.java | 1 - .../common/counter/AddCountersAllEffect.java | 1 - .../counter/AddCountersAttachedEffect.java | 1 - .../counter/AddCountersControllerEffect.java | 1 - .../counter/AddCountersSourceEffect.java | 1 - .../counter/AddCountersTargetEffect.java | 6 +- .../AddPlusOneCountersAttachedEffect.java | 4 +- .../counter/AddPoisonCounterTargetEffect.java | 2 +- ...AddRemoveAllTimeSuspentCountersEffect.java | 1 - .../counter/DistributeCountersEffect.java | 1 - .../common/counter/ProliferateEffect.java | 10 +-- .../counter/RemoveCounterTargetEffect.java | 1 - .../counter/RemoveCountersAttachedEffect.java | 4 +- .../DiscardCardYouChooseTargetEffect.java | 6 +- .../discard/DiscardEachPlayerEffect.java | 6 +- .../common/discard/DiscardHandAllEffect.java | 6 +- .../discard/DiscardHandTargetEffect.java | 1 - .../common/discard/DiscardTargetEffect.java | 1 - .../EnterAttributeAddChosenSubtypeEffect.java | 1 + .../CantHaveCountersSourceEffect.java | 1 - .../CantRegenerateTargetEffect.java | 1 - ...getsHaveToTargetPermanentIfAbleEffect.java | 6 +- ...ibraryGraveyardWithLessCMCPutIntoPlay.java | 2 +- .../search/SearchLibraryPutInHandEffect.java | 1 - ...LibraryPutInHandOrOnBattlefieldEffect.java | 1 - .../search/SearchLibraryPutInPlayEffect.java | 6 +- ...rchLibraryPutInPlayTargetPlayerEffect.java | 1 - ...archLibraryWithLessCMCPutInPlayEffect.java | 2 +- ...dHandLibraryForCardNameAndExileEffect.java | 1 - .../turn/AddExtraTurnControllerEffect.java | 1 - .../ControlTargetPlayerNextTurnEffect.java | 1 - .../common/turn/SkipNextTurnSourceEffect.java | 1 - .../effects/keyword/AmassEffect.java | 4 +- .../abilities/effects/keyword/EchoEffect.java | 4 +- .../effects/keyword/ExploreSourceEffect.java | 1 - .../effects/keyword/ManifestEffect.java | 1 - .../keyword/ManifestTargetPlayerEffect.java | 1 - .../AddConditionalManaOfAnyColorEffect.java | 9 +- ...itionalManaOfTwoDifferentColorsEffect.java | 1 - ...dManaAnyColorAttachedControllerEffect.java | 6 +- .../mana/AddManaInAnyCombinationEffect.java | 8 +- .../effects/mana/AddManaOfAnyColorEffect.java | 6 +- .../mana/AddManaOfAnyTypeProducedEffect.java | 6 +- .../AddManaOfTwoDifferentColorsEffect.java | 6 +- ...dManaToManaPoolTargetControllerEffect.java | 6 +- .../effects/mana/BasicManaEffect.java | 1 + .../mana/DoUnlessAnyPlayerPaysManaEffect.java | 7 +- .../effects/mana/DynamicManaEffect.java | 6 +- .../mage/abilities/hint/ConditionHint.java | 4 +- .../main/java/mage/abilities/hint/Hint.java | 4 +- .../java/mage/abilities/hint/HintUtils.java | 2 +- .../java/mage/abilities/hint/StaticHint.java | 4 +- .../abilities/keyword/AfflictAbility.java | 1 - .../abilities/keyword/AftermathAbility.java | 10 +-- .../abilities/keyword/AnnihilatorAbility.java | 6 +- .../mage/abilities/keyword/AscendAbility.java | 3 +- .../mage/abilities/keyword/AssistAbility.java | 6 +- .../keyword/AttacksThisTurnMarkerAbility.java | 6 +- .../mage/abilities/keyword/AwakenAbility.java | 14 +-- .../abilities/keyword/BandingAbility.java | 1 - .../abilities/keyword/BattalionAbility.java | 2 +- .../keyword/BlocksThisTurnMarkerAbility.java | 6 +- .../abilities/keyword/BloodrushAbility.java | 2 +- .../abilities/keyword/BloodthirstAbility.java | 1 - .../abilities/keyword/BuybackAbility.java | 10 +-- .../keyword/CanBlockSpaceflightAbility.java | 1 - .../keyword/CantBlockAloneAbility.java | 6 +- .../abilities/keyword/ChampionAbility.java | 1 - .../abilities/keyword/ChangelingAbility.java | 4 +- .../abilities/keyword/ChannelAbility.java | 2 +- .../abilities/keyword/ConspireAbility.java | 10 +-- .../abilities/keyword/ConvokeAbility.java | 1 - .../mage/abilities/keyword/CrewAbility.java | 8 +- .../mage/abilities/keyword/DashAbility.java | 1 - .../abilities/keyword/DeathtouchAbility.java | 6 +- .../abilities/keyword/DefenderAbility.java | 6 +- .../mage/abilities/keyword/DelveAbility.java | 4 +- .../abilities/keyword/DethroneAbility.java | 1 - .../keyword/DoubleStrikeAbility.java | 1 - .../mage/abilities/keyword/EchoAbility.java | 4 +- .../mage/abilities/keyword/EmergeAbility.java | 4 +- .../abilities/keyword/EnchantAbility.java | 2 +- .../abilities/keyword/EntwineAbility.java | 10 +-- .../mage/abilities/keyword/EscapeAbility.java | 4 +- .../mage/abilities/keyword/EvokeAbility.java | 1 - .../mage/abilities/keyword/ExertAbility.java | 1 - .../mage/abilities/keyword/ExtortAbility.java | 2 +- .../mage/abilities/keyword/FearAbility.java | 4 +- .../abilities/keyword/FirstStrikeAbility.java | 1 - .../mage/abilities/keyword/FlashAbility.java | 1 - .../abilities/keyword/FlashbackAbility.java | 1 - .../mage/abilities/keyword/FlyingAbility.java | 4 +- .../abilities/keyword/ForecastAbility.java | 1 - .../abilities/keyword/FortifyAbility.java | 11 ++- .../mage/abilities/keyword/GraftAbility.java | 1 - .../mage/abilities/keyword/HasteAbility.java | 1 - .../mage/abilities/keyword/HeroicAbility.java | 4 +- .../abilities/keyword/HexproofAbility.java | 1 - .../keyword/HexproofFromBlackAbility.java | 1 - .../keyword/HexproofFromBlueAbility.java | 4 +- .../HexproofFromMonocoloredAbility.java | 4 +- .../keyword/HexproofFromWhiteAbility.java | 1 - .../abilities/keyword/HideawayAbility.java | 1 - .../keyword/HorsemanshipAbility.java | 4 +- .../abilities/keyword/ImproviseAbility.java | 1 - .../keyword/IndestructibleAbility.java | 3 +- .../mage/abilities/keyword/InfectAbility.java | 6 +- .../mage/abilities/keyword/KickerAbility.java | 19 ++-- .../abilities/keyword/LevelerCardBuilder.java | 1 - .../abilities/keyword/LeylineAbility.java | 1 - .../abilities/keyword/LifelinkAbility.java | 6 +- .../abilities/keyword/MadnessAbility.java | 1 - .../mage/abilities/keyword/MeleeAbility.java | 6 +- .../abilities/keyword/ModularAbility.java | 1 - .../mage/abilities/keyword/MorphAbility.java | 1 - .../mage/abilities/keyword/MyriadAbility.java | 6 +- .../abilities/keyword/NinjutsuAbility.java | 1 - .../abilities/keyword/OfferingAbility.java | 8 +- .../abilities/keyword/PartnerAbility.java | 1 - .../abilities/keyword/PartnerWithAbility.java | 1 - .../abilities/keyword/PhasingAbility.java | 1 - .../abilities/keyword/ProtectionAbility.java | 1 - .../abilities/keyword/ProvokeAbility.java | 1 - .../mage/abilities/keyword/ProwlAbility.java | 1 - .../mage/abilities/keyword/ReachAbility.java | 6 +- .../abilities/keyword/ReboundAbility.java | 4 +- .../mage/abilities/keyword/RepairAbility.java | 1 - .../abilities/keyword/ReplicateAbility.java | 10 +-- .../abilities/keyword/ScavengeAbility.java | 6 +- .../mage/abilities/keyword/ShadowAbility.java | 4 +- .../mage/abilities/keyword/ShroudAbility.java | 6 +- .../abilities/keyword/SoulshiftAbility.java | 6 +- .../abilities/keyword/SpaceflightAbility.java | 4 +- .../abilities/keyword/SpectacleAbility.java | 6 +- .../keyword/SpliceOntoArcaneAbility.java | 7 +- .../SpliceOntoInstantOrSorceryAbility.java | 4 +- .../abilities/keyword/SplitSecondAbility.java | 4 +- .../keyword/SquirrellinkAbility.java | 6 +- .../mage/abilities/keyword/StormAbility.java | 3 +- .../abilities/keyword/SunburstAbility.java | 1 - .../mage/abilities/keyword/SurgeAbility.java | 6 +- .../abilities/keyword/SuspendAbility.java | 9 +- .../abilities/keyword/TrampleAbility.java | 1 - .../abilities/keyword/TransformAbility.java | 9 +- .../abilities/keyword/TransmuteAbility.java | 2 +- .../abilities/keyword/TributeAbility.java | 1 - .../abilities/keyword/VigilanceAbility.java | 6 +- .../mage/abilities/keyword/WitherAbility.java | 6 +- .../special/JohanVigilanceAbility.java | 6 +- .../mana/ActivatedManaAbilityImpl.java | 1 - .../mana/AnyColorLandsProduceManaAbility.java | 6 +- .../AnyColorPermanentTypesManaAbility.java | 6 +- .../mage/abilities/mana/BasicManaAbility.java | 2 +- .../CommanderColorIdentityManaAbility.java | 8 +- .../mana/ConditionalAnyColorManaAbility.java | 1 - .../mana/ConditionalManaAbility.java | 1 - .../mana/DelayedTriggeredManaAbility.java | 2 +- .../abilities/mana/DynamicManaAbility.java | 1 - .../java/mage/abilities/mana/ManaAbility.java | 1 - .../java/mage/abilities/mana/ManaOptions.java | 4 +- .../abilities/mana/SimpleManaAbility.java | 1 - .../abilities/mana/TriggeredManaAbility.java | 1 - .../InstantOrSorcerySpellManaBuilder.java | 4 +- .../SimpleActivatedAbilityManaBuilder.java | 4 +- .../ArtifactCastManaCondition.java | 1 - .../ConditionalSpellManaBuilder.java | 1 - .../CreatureCastManaCondition.java | 1 - .../mana/conditional/ManaCondition.java | 1 - .../PlaneswalkerCastManaCondition.java | 4 +- .../abilities/meta/OrTriggeredAbility.java | 1 - .../java/mage/abilities/text/TextPart.java | 1 - .../java/mage/actions/MageDrawAction.java | 1 - .../score/ArtificialScoringSystem.java | 3 +- .../main/java/mage/cards/AdventureCard.java | 1 - .../mage/cards/AdventureCardSpellImpl.java | 10 +-- Mage/src/main/java/mage/cards/Card.java | 1 - .../main/java/mage/cards/CardGraphicInfo.java | 4 +- Mage/src/main/java/mage/cards/CardImpl.java | 28 ++---- .../src/main/java/mage/cards/CardSetInfo.java | 4 +- Mage/src/main/java/mage/cards/Cards.java | 1 - Mage/src/main/java/mage/cards/CardsImpl.java | 18 +--- .../main/java/mage/cards/ExpansionSet.java | 13 +-- .../src/main/java/mage/cards/LevelerCard.java | 1 - Mage/src/main/java/mage/cards/MeldCard.java | 6 +- Mage/src/main/java/mage/cards/Sets.java | 13 +-- Mage/src/main/java/mage/cards/SplitCard.java | 1 - .../java/mage/cards/SplitCardHalfImpl.java | 6 +- .../java/mage/cards/basiclands/BasicLand.java | 4 +- .../java/mage/cards/basiclands/Forest.java | 1 - .../java/mage/cards/basiclands/Island.java | 1 - .../java/mage/cards/basiclands/Mountain.java | 1 - .../java/mage/cards/basiclands/Plains.java | 1 - .../java/mage/cards/basiclands/Swamp.java | 1 - .../java/mage/cards/decks/Constructed.java | 13 +-- Mage/src/main/java/mage/cards/decks/Deck.java | 4 +- .../java/mage/cards/decks/DeckFileFilter.java | 3 +- .../java/mage/cards/decks/DeckFormats.java | 19 ++-- .../mage/cards/decks/DeckFormatsTest.java | 6 +- .../java/mage/cards/decks/DeckValidator.java | 4 +- .../cards/decks/DeckValidatorFactory.java | 4 +- .../cards/decks/DnDDeckTargetListener.java | 7 +- .../cards/decks/exporter/DeckExporter.java | 9 +- .../decks/exporter/MtgArenaDeckExporter.java | 14 +-- .../exporter/MtgArenaDeckExporterTest.java | 9 +- .../decks/exporter/MtgOnlineDeckExporter.java | 11 ++- .../decks/exporter/XmageDeckExporter.java | 15 ++-- .../decks/exporter/XmageInfoDeckExporter.java | 15 ++-- .../cards/decks/importer/DckDeckImporter.java | 10 +-- .../cards/decks/importer/DecDeckImporter.java | 1 + .../cards/decks/importer/DeckImporter.java | 5 +- .../decks/importer/DraftLogImporter.java | 8 +- .../cards/decks/importer/MWSDeckImporter.java | 1 + .../cards/decks/importer/MtgaImporter.java | 14 +-- .../cards/decks/importer/TxtDeckImporter.java | 10 +-- .../main/java/mage/cards/mock/MockCard.java | 7 +- .../java/mage/cards/mock/MockSplitCard.java | 4 +- .../mage/cards/repository/CardCriteria.java | 10 +-- .../java/mage/cards/repository/CardInfo.java | 28 ++---- .../mage/cards/repository/CardRepository.java | 18 ++-- .../mage/cards/repository/CardScanner.java | 12 +-- .../mage/cards/repository/ExpansionInfo.java | 5 +- .../cards/repository/ExpansionRepository.java | 18 ++-- .../cards/repository/RepositoryEvent.java | 4 +- .../repository/RepositoryEventSource.java | 4 +- .../mage/cards/repository/RepositoryUtil.java | 10 +-- .../main/java/mage/choices/ChoiceColor.java | 6 +- .../java/mage/choices/ChoiceCreatureType.java | 6 +- .../main/java/mage/choices/ChoiceImpl.java | 10 +-- .../java/mage/choices/ChoiceLandType.java | 4 +- Mage/src/main/java/mage/choices/Choices.java | 8 +- .../mage/choices/ChooseFriendsAndFoes.java | 1 - .../main/java/mage/constants/CardType.java | 6 +- .../src/main/java/mage/constants/SubType.java | 10 +-- .../java/mage/constants/TargetController.java | 4 +- Mage/src/main/java/mage/counters/Counter.java | 1 - .../java/mage/designations/Designation.java | 10 +-- Mage/src/main/java/mage/filter/Filter.java | 1 - .../src/main/java/mage/filter/FilterCard.java | 7 +- .../src/main/java/mage/filter/FilterImpl.java | 1 - .../main/java/mage/filter/FilterInPlay.java | 1 - .../java/mage/filter/FilterPermanent.java | 10 +-- .../main/java/mage/filter/FilterPlayer.java | 8 +- .../main/java/mage/filter/FilterSpell.java | 1 - .../java/mage/filter/FilterStackObject.java | 8 +- .../main/java/mage/filter/StaticFilters.java | 23 +---- .../FilterControlledCreatureInPlay.java | 1 - .../common/FilterCreatureAttackingYou.java | 2 +- .../filter/common/FilterCreatureOrPlayer.java | 1 - .../FilterCreaturePlayerOrPlaneswalker.java | 1 + .../common/FilterPermanentOrPlayer.java | 1 - .../FilterPermanentOrPlayerWithCounter.java | 4 +- .../common/FilterPlaneswalkerOrPlayer.java | 1 - .../java/mage/filter/predicate/Predicate.java | 1 - .../mage/filter/predicate/Predicates.java | 4 +- .../mageobject/AnotherTargetPredicate.java | 1 - .../predicate/mageobject/CardIdPredicate.java | 1 - .../EnchantmentOrEnchantedPredicate.java | 4 +- .../mageobject/FromSetPredicate.java | 1 - .../mageobject/NumberOfTargetsPredicate.java | 2 +- .../mageobject/SharesColorPredicate.java | 2 + .../mageobject/VariableManaCostPredicate.java | 1 + .../AuraCardCanAttachToLKIPermanentId.java | 1 - .../other/AuraCardCanAttachToPermanentId.java | 1 - .../AuraPermanentCanAttachToPermanentId.java | 1 - .../other/CardCanTargetPermanentId.java | 1 - .../predicate/other/CardTextPredicate.java | 6 +- .../predicate/other/OwnerIdPredicate.java | 1 - .../other/PermanentCanTargetPermanentId.java | 1 - .../predicate/other/PlayerIdPredicate.java | 1 - .../other/TargetsOnlyOnePlayerPredicate.java | 1 - .../other/TargetsPermanentPredicate.java | 1 - .../other/TargetsPlayerPredicate.java | 1 - .../permanent/AttachedToPredicate.java | 1 - .../AttackingSameNotBandedPredicate.java | 4 +- .../permanent/BlockedByIdPredicate.java | 1 - .../BlockingAttackerIdPredicate.java | 1 - .../permanent/ControllerIdPredicate.java | 4 +- .../ControllerIsActivePlayerPredicate.java | 2 + .../DamagedPlayerThisTurnPredicate.java | 4 +- .../permanent/EnchantedPredicate.java | 4 +- .../permanent/EquippedPredicate.java | 4 +- .../permanent/PermanentIdPredicate.java | 1 - .../permanent/PermanentInListPredicate.java | 1 - .../main/java/mage/game/CardAttribute.java | 1 - Mage/src/main/java/mage/game/CardState.java | 1 - Mage/src/main/java/mage/game/Exile.java | 15 ++-- Mage/src/main/java/mage/game/ExileZone.java | 4 +- Mage/src/main/java/mage/game/Game.java | 17 +--- .../mage/game/GameCanadianHighlanderImpl.java | 4 +- .../java/mage/game/GameCommanderImpl.java | 1 - Mage/src/main/java/mage/game/GameImpl.java | 77 +++-------------- Mage/src/main/java/mage/game/GameOptions.java | 4 +- Mage/src/main/java/mage/game/GameState.java | 32 ++----- Mage/src/main/java/mage/game/GameStates.java | 1 - .../java/mage/game/GameTinyLeadersImpl.java | 16 ++-- Mage/src/main/java/mage/game/LookedAt.java | 10 +-- Mage/src/main/java/mage/game/Revealed.java | 1 - Mage/src/main/java/mage/game/Seat.java | 4 +- Mage/src/main/java/mage/game/Table.java | 7 +- Mage/src/main/java/mage/game/Team.java | 1 - .../main/java/mage/game/ZoneChangeInfo.java | 1 - .../src/main/java/mage/game/ZonesHandler.java | 11 +-- .../main/java/mage/game/combat/Combat.java | 16 +--- .../java/mage/game/combat/CombatGroup.java | 7 +- .../java/mage/game/command/CommandObject.java | 1 - .../java/mage/game/command/Commander.java | 14 ++- .../main/java/mage/game/command/Emblem.java | 8 +- .../main/java/mage/game/command/Plane.java | 10 +-- .../command/emblems/DackFaydenEmblem.java | 1 - .../emblems/JaceUnravelerOfSecretsEmblem.java | 4 +- .../command/emblems/JayaBallardEmblem.java | 1 - .../emblems/KothOfTheHammerEmblem.java | 9 +- .../command/emblems/LukeSkywalkerEmblem.java | 11 ++- .../game/command/emblems/MomirEmblem.java | 4 +- .../ObNixilisOfTheBlackOathEmblem.java | 3 +- .../emblems/TezzeretTheSchemerEmblem.java | 3 +- .../command/emblems/WrennAndSixEmblem.java | 10 +-- .../planes/AcademyAtTolariaWestPlane.java | 1 - .../mage/game/command/planes/AgyremPlane.java | 8 +- .../mage/game/command/planes/AkoumPlane.java | 1 - .../game/command/planes/AstralArenaPlane.java | 8 +- .../mage/game/command/planes/BantPlane.java | 1 - .../command/planes/EdgeOfMalacolPlane.java | 3 +- .../command/planes/FeedingGroundsPlane.java | 1 - .../command/planes/FieldsOfSummerPlane.java | 1 - .../planes/HedronFieldsOfAgadeemPlane.java | 6 +- .../game/command/planes/LetheLakePlane.java | 1 - .../mage/game/command/planes/NayaPlane.java | 1 - .../game/command/planes/PanopticonPlane.java | 1 - .../mage/game/command/planes/TazeemPlane.java | 6 +- .../command/planes/TheDarkBaronyPlane.java | 1 - .../game/command/planes/TheEonFogPlane.java | 1 - .../command/planes/TheGreatForestPlane.java | 2 +- .../command/planes/TheZephyrMazePlane.java | 1 - .../planes/TrailOfTheMageRingsPlane.java | 1 - .../game/command/planes/TrugaJunglePlane.java | 1 - .../game/command/planes/TurriIslandPlane.java | 1 - .../command/planes/UndercityReachesPlane.java | 1 - .../java/mage/game/draft/BoosterDraft.java | 1 - Mage/src/main/java/mage/game/draft/Draft.java | 1 - .../main/java/mage/game/draft/DraftCube.java | 4 +- .../main/java/mage/game/draft/DraftImpl.java | 16 +--- .../java/mage/game/draft/DraftOptions.java | 1 - .../java/mage/game/draft/DraftPlayer.java | 1 - .../mage/game/draft/RandomBoosterDraft.java | 3 +- .../main/java/mage/game/draft/RateCard.java | 23 ++--- .../mage/game/draft/RichManBoosterDraft.java | 4 +- .../game/draft/RichManCubeBoosterDraft.java | 6 +- .../mage/game/events/CoinFlippedEvent.java | 4 +- .../main/java/mage/game/events/CostEvent.java | 1 - .../events/EntersTheBattlefieldEvent.java | 2 +- .../java/mage/game/events/FlipCoinEvent.java | 4 +- .../main/java/mage/game/events/GameEvent.java | 6 +- .../main/java/mage/game/events/ManaEvent.java | 1 - .../mage/game/events/PlayerQueryEvent.java | 1 - .../game/events/PlayerQueryEventSource.java | 1 - .../java/mage/game/events/TableEvent.java | 1 - .../mage/game/events/TableEventSource.java | 8 +- .../mage/game/events/ZoneChangeEvent.java | 1 - .../game/events/ZoneChangeGroupEvent.java | 6 +- Mage/src/main/java/mage/game/match/Match.java | 1 - .../main/java/mage/game/match/MatchImpl.java | 11 +-- .../java/mage/game/match/MatchOptions.java | 12 +-- .../java/mage/game/match/MatchPlayer.java | 4 +- .../mulligan/CanadianHighlanderMulligan.java | 6 +- .../mage/game/mulligan/LondonMulligan.java | 8 +- .../java/mage/game/mulligan/Mulligan.java | 8 +- .../mage/game/mulligan/ParisMulligan.java | 4 +- .../mage/game/mulligan/VancouverMulligan.java | 4 +- .../java/mage/game/permanent/Battlefield.java | 8 +- .../java/mage/game/permanent/Permanent.java | 8 +- .../mage/game/permanent/PermanentCard.java | 4 +- .../mage/game/permanent/PermanentImpl.java | 55 ++---------- .../mage/game/permanent/PermanentMeld.java | 1 - .../mage/game/permanent/PermanentToken.java | 4 +- .../mage/game/permanent/token/ATATToken.java | 4 +- .../token/AbhorrentOverlordHarpyToken.java | 4 +- .../token/AerieWorshippersBirdToken.java | 4 +- .../token/AkoumStonewakerElementalToken.java | 4 +- .../permanent/token/AkroanSoldierToken.java | 4 +- .../mage/game/permanent/token/AngelToken.java | 1 - .../permanent/token/AnotherSpiritToken.java | 4 +- .../permanent/token/AnthousaWarriorToken.java | 2 +- .../mage/game/permanent/token/ApeToken.java | 2 +- .../ArchitectOfTheUntamedBeastToken.java | 2 +- .../token/AshiokNightmareMuseToken.java | 10 +-- .../game/permanent/token/AssassinToken.java | 4 +- .../permanent/token/AssemblyWorkerToken.java | 2 +- .../game/permanent/token/AvatarToken.java | 4 +- .../game/permanent/token/BalduvianToken.java | 4 +- .../permanent/token/BaruFistOfKrosaToken.java | 2 +- .../mage/game/permanent/token/BatToken.java | 1 - .../token/BearsCompanionBearToken.java | 2 +- .../mage/game/permanent/token/BeastToken.java | 8 +- .../game/permanent/token/BeastToken2.java | 8 +- .../game/permanent/token/BeastToken4.java | 4 + .../permanent/token/BelzenlokClericToken.java | 1 - .../permanent/token/BelzenlokDemonToken.java | 8 +- .../permanent/token/BirdIllusionToken.java | 4 +- .../permanent/token/BirdSoldierToken.java | 4 +- .../mage/game/permanent/token/BirdToken.java | 1 - .../mage/game/permanent/token/BoarToken.java | 2 +- .../game/permanent/token/BrainiacToken.java | 2 +- .../token/BrokenVisageSpiritToken.java | 2 +- .../token/BroodKeeperDragonToken.java | 4 +- .../game/permanent/token/ButterflyToken.java | 4 +- .../game/permanent/token/CaribouToken.java | 2 +- .../game/permanent/token/CarnivoreToken.java | 2 +- .../token/CarrionBlackInsectToken.java | 2 +- .../mage/game/permanent/token/CatToken.java | 1 - .../game/permanent/token/CatWarriorToken.java | 3 +- .../game/permanent/token/CentaurToken.java | 8 +- .../token/ChainersTormentNightmareToken.java | 3 +- .../token/ChasmSkulkerSquidToken.java | 4 +- .../permanent/token/CloudSpriteToken.java | 4 +- .../permanent/token/ClueArtifactToken.java | 8 +- .../game/permanent/token/ConstructToken.java | 4 +- .../token/CoralBarrierSquidToken.java | 4 +- .../token/CorpseweftZombieToken.java | 2 +- .../token/CorruptedZendikonOozeToken.java | 2 +- .../permanent/token/CreakwoodLiegeToken.java | 2 +- .../permanent/token/CrestedSunmareToken.java | 2 +- .../token/CribSwapShapeshifterWhiteToken.java | 4 +- .../token/CrushOfTentaclesToken.java | 2 +- .../token/CurseOfTheSwineBoarToken.java | 2 +- .../token/DarettiConstructToken.java | 4 +- .../permanent/token/DaxosSpiritToken.java | 4 +- .../game/permanent/token/DeadlyGrubToken.java | 4 +- .../permanent/token/DeathpactAngelToken.java | 4 +- .../permanent/token/DeathtouchRatToken.java | 3 +- .../permanent/token/DeathtouchSnakeToken.java | 4 +- .../mage/game/permanent/token/DemonToken.java | 1 - .../game/permanent/token/DeserterToken.java | 2 +- .../token/DinOfTheFireherdToken.java | 2 +- .../game/permanent/token/DinosaurToken.java | 2 +- .../game/permanent/token/DjinnMonkToken.java | 4 +- .../mage/game/permanent/token/DjinnToken.java | 4 +- .../token/DokaiWeaverofLifeToken.java | 4 +- .../game/permanent/token/DovescapeToken.java | 4 +- .../permanent/token/DragonEggDragonToken.java | 2 +- .../game/permanent/token/DragonToken.java | 8 +- .../game/permanent/token/DragonToken2.java | 8 +- .../game/permanent/token/DragonTokenGold.java | 1 - .../mage/game/permanent/token/DrakeToken.java | 4 +- .../token/DuneBroodNephilimToken.java | 2 +- .../permanent/token/EdgarMarkovToken.java | 3 +- .../token/EldraziAnnihilatorToken.java | 4 +- .../permanent/token/EldraziHorrorToken.java | 1 - .../game/permanent/token/EldraziToken.java | 2 +- .../permanent/token/ElementalCatToken.java | 4 +- .../permanent/token/ElementalShamanToken.java | 1 - .../game/permanent/token/ElementalToken.java | 1 - .../token/ElephantResurgenceToken.java | 4 +- .../game/permanent/token/ElephantToken.java | 8 +- .../mage/game/permanent/token/ElfToken.java | 1 - .../permanent/token/EtheriumCellToken.java | 2 +- .../permanent/token/ExpansionSymbolToken.java | 2 +- .../token/EyesOfTheWisentElementalToken.java | 2 +- .../permanent/token/FaerieRogueToken.java | 4 +- .../permanent/token/FesteringGoblinToken.java | 4 +- .../token/FleshCarverHorrorToken.java | 2 +- .../token/FlurryOfHornsMinotaurToken.java | 4 +- .../mage/game/permanent/token/FoodToken.java | 8 +- .../token/ForlornPseudammaZombieToken.java | 2 +- .../token/FreyaliseLlanowarsFuryToken.java | 5 +- .../mage/game/permanent/token/FrogToken.java | 2 +- .../game/permanent/token/GargoyleToken.java | 4 +- .../token/GarrukApexPredatorBeastToken.java | 4 +- .../mage/game/permanent/token/GermToken.java | 1 - .../token/GiantBaitingGiantWarriorToken.java | 4 +- .../mage/game/permanent/token/GiantToken.java | 2 +- .../permanent/token/GiantWarriorToken.java | 2 +- .../mage/game/permanent/token/GnomeToken.java | 2 +- .../mage/game/permanent/token/GoatToken.java | 8 +- .../permanent/token/GoblinRogueToken.java | 3 +- .../permanent/token/GoblinScoutsToken.java | 4 +- .../permanent/token/GoblinSoldierToken.java | 2 +- .../game/permanent/token/GoblinToken.java | 8 +- .../permanent/token/GoblinTrenchesToken.java | 2 +- .../token/GodFavoredGeneralSoldierToken.java | 2 +- .../permanent/token/GodSireBeastToken.java | 2 +- .../mage/game/permanent/token/GoldToken.java | 8 +- .../token/GoldmeadowHarrierToken.java | 4 +- .../mage/game/permanent/token/GolemToken.java | 8 +- .../game/permanent/token/GriffinToken.java | 4 +- .../permanent/token/GrismoldPlantToken.java | 8 +- .../token/GrovetenderDruidsPlantToken.java | 2 +- .../token/GuardianIdolGolemToken.java | 2 +- .../permanent/token/GutterGrimeToken.java | 5 +- .../token/HammerOfPurphorosGolemToken.java | 2 +- .../permanent/token/HauntedAngelToken.java | 4 +- .../token/HeliodGodOfTheSunToken.java | 2 +- .../game/permanent/token/HomunculusToken.java | 2 +- .../token/HornetNestInsectToken.java | 4 +- .../token/HornetQueenInsectToken.java | 4 +- .../game/permanent/token/HorrorToken.java | 2 +- .../mage/game/permanent/token/HoundToken.java | 2 +- .../token/HourOfNeedSphinxToken.java | 4 +- .../permanent/token/HumanClericToken.java | 2 +- .../mage/game/permanent/token/HumanToken.java | 4 +- .../permanent/token/HuntedCentaurToken.java | 5 +- .../token/HuntedDragonKnightToken.java | 1 - .../token/HydraBroodmasterToken.java | 2 +- .../game/permanent/token/IllusionToken.java | 2 +- .../token/InexorableBlobOozeToken.java | 2 +- .../permanent/token/InsectInfectToken.java | 4 +- .../game/permanent/token/InsectToken.java | 1 - .../permanent/token/IxalanVampireToken.java | 4 +- .../permanent/token/IzoniInsectToken.java | 2 +- .../JaceCunningCastawayIllusionToken.java | 4 +- .../token/JoinTheRanksSoldierToken.java | 2 +- .../game/permanent/token/KaldraToken.java | 2 +- .../permanent/token/KalitasVampireToken.java | 2 +- ...KalonianTwingroveTreefolkWarriorToken.java | 2 +- .../permanent/token/KarnConstructToken.java | 8 +- .../token/KaroxBladewingDragonToken.java | 1 - .../mage/game/permanent/token/KelpToken.java | 4 +- .../permanent/token/KherKeepKoboldToken.java | 2 +- .../permanent/token/KioraKrakenToken.java | 2 +- .../game/permanent/token/KithkinToken.java | 1 - .../game/permanent/token/KnightAllyToken.java | 2 +- .../game/permanent/token/KnightToken.java | 8 +- .../game/permanent/token/KorSoldierToken.java | 3 +- .../game/permanent/token/LandMineToken.java | 2 +- .../token/LeafdrakeRoostDrakeToken.java | 5 +- .../permanent/token/LightningRagerToken.java | 4 +- .../permanent/token/LinvalaAngelToken.java | 4 +- .../game/permanent/token/LizardToken.java | 2 +- .../permanent/token/LlanowarElvesToken.java | 4 +- .../MarathWillOfTheWildElementalToken.java | 2 +- .../token/MarduStrikeLeaderWarriorToken.java | 2 +- .../game/permanent/token/MaritLageToken.java | 4 +- .../token/MasterOfWavesElementalToken.java | 2 +- .../token/MelokuTheCloudedMirrorToken.java | 4 +- .../permanent/token/MercyKillingToken.java | 2 +- .../game/permanent/token/MerfolkToken.java | 2 +- .../MetallurgicSummoningsConstructToken.java | 2 +- .../game/permanent/token/MinorDemonToken.java | 2 +- .../permanent/token/MonasteryMentorToken.java | 4 +- .../mage/game/permanent/token/MyrToken.java | 8 +- .../token/MysticGenesisOozeToken.java | 2 +- .../NahiriTheLithomancerEquipmentToken.java | 4 +- .../token/NestOfScarabsBlackInsectToken.java | 2 +- .../token/NighteyesTheDesecratorToken.java | 4 +- .../permanent/token/NightwingHorrorToken.java | 4 +- .../game/permanent/token/OctopusToken.java | 2 +- .../mage/game/permanent/token/OgreToken.java | 2 +- .../token/OneDozenEyesBeastToken.java | 2 +- .../permanent/token/OonaQueenFaerieToken.java | 4 +- .../mage/game/permanent/token/Ooze2Token.java | 4 +- .../token/OphiomancerSnakeToken.java | 4 +- .../OviyaPashiriSageLifecrafterToken.java | 2 +- .../mage/game/permanent/token/OwlToken.java | 4 +- .../token/PatagiaViperSnakeToken.java | 2 +- .../game/permanent/token/PegasusToken.java | 4 +- .../game/permanent/token/PentaviteToken.java | 4 +- .../permanent/token/PenumbraBobcatToken.java | 2 +- .../permanent/token/PenumbraKavuToken.java | 2 +- .../permanent/token/PenumbraSpiderToken.java | 4 +- .../permanent/token/PenumbraWurmToken.java | 4 +- .../mage/game/permanent/token/PestToken.java | 2 +- .../permanent/token/PharikaSnakeToken.java | 2 +- .../token/PhyrexianRebirthHorrorToken.java | 2 +- .../game/permanent/token/PincherToken.java | 2 +- .../game/permanent/token/PirateToken.java | 2 +- .../mage/game/permanent/token/PlantToken.java | 1 - .../game/permanent/token/PongifyApeToken.java | 2 +- .../mage/game/permanent/token/PorgToken.java | 4 +- .../mage/game/permanent/token/PrismToken.java | 1 - .../token/PromiseOfPowerDemonToken.java | 4 +- .../permanent/token/ProsshKoboldToken.java | 2 +- .../token/QueenMarchesaAssassinToken.java | 4 +- .../game/permanent/token/RabidSheepToken.java | 2 +- .../token/RakdosGuildmageGoblinToken.java | 4 +- .../token/RallyTheHordeWarriorToken.java | 2 +- .../mage/game/permanent/token/RatToken.java | 8 +- .../permanent/token/RebelStarshipToken.java | 2 +- .../game/permanent/token/RedHumanToken.java | 4 +- .../permanent/token/ReefWormFishToken.java | 4 +- .../permanent/token/ReefWormKrakenToken.java | 2 +- .../permanent/token/ReefWormWhaleToken.java | 4 +- .../permanent/token/ReflectionPureToken.java | 2 +- .../game/permanent/token/ReflectionToken.java | 2 +- .../permanent/token/ReignOfThePitToken.java | 4 +- .../token/RenownedWeaverSpiderToken.java | 4 +- .../token/RetrofitterFoundryToken.java | 2 +- .../mage/game/permanent/token/RhinoToken.java | 4 +- .../token/RhonassLastStandToken.java | 2 +- .../permanent/token/RhysTheRedeemedToken.java | 2 +- .../token/RiftmarkedKnightToken.java | 4 +- .../token/RiptideReplicatorToken.java | 2 +- .../token/RiseOfEaglesBirdToken.java | 4 +- .../token/RitualOfTheReturnedZombieToken.java | 2 +- .../game/permanent/token/RocEggToken.java | 4 +- .../game/permanent/token/RoyalGuardToken.java | 2 +- .../permanent/token/SaprolingBurstToken.java | 4 +- .../game/permanent/token/SaprolingToken.java | 8 +- .../token/SatyrNyxSmithElementalToken.java | 4 +- .../SekKuarDeathkeeperGravebornToken.java | 4 +- .../token/SengirNosferatuBatToken.java | 5 +- .../mage/game/permanent/token/SerfToken.java | 2 +- .../mage/game/permanent/token/ServoToken.java | 1 - .../permanent/token/ShapeshifterToken.java | 8 +- .../game/permanent/token/SkeletonToken.java | 2 +- .../token/SkywiseTeachingsToken.java | 4 +- .../game/permanent/token/SliverToken.java | 3 +- .../permanent/token/SliversmithToken.java | 2 +- .../mage/game/permanent/token/SnakeToken.java | 8 +- .../game/permanent/token/SoldierToken.java | 8 +- .../token/SoldierTokenWithHaste.java | 5 +- .../SorinLordOfInnistradVampireToken.java | 4 +- .../token/SorinSolemnVisitorVampireToken.java | 4 +- .../permanent/token/SoundTheCallToken.java | 4 +- .../permanent/token/SparkElementalToken.java | 4 +- .../token/SpawningGroundsBeastToken.java | 4 +- .../permanent/token/SpawningPitToken.java | 2 +- .../game/permanent/token/SpiderToken.java | 8 +- .../mage/game/permanent/token/SpikeToken.java | 2 +- .../game/permanent/token/SpiritBlueToken.java | 4 +- .../game/permanent/token/SpiritToken.java | 8 +- .../permanent/token/SpiritWhiteToken.java | 8 +- .../game/permanent/token/SplinterToken.java | 6 +- .../token/SpoilsOfBloodHorrorToken.java | 2 +- .../permanent/token/SpyMasterGoblinToken.java | 4 +- .../game/permanent/token/SquirrelToken.java | 8 +- .../game/permanent/token/StanggTwinToken.java | 2 +- .../token/StitcherGeralfZombieToken.java | 2 +- .../StitchersApprenticeHomunculusToken.java | 2 +- .../permanent/token/StoneTrapIdolToken.java | 4 +- .../game/permanent/token/StormCrowToken.java | 4 +- .../token/SubterraneanTremorsLizardToken.java | 2 +- .../permanent/token/SwanSongBirdToken.java | 4 +- .../token/SylvanOfferingTreefolkToken.java | 2 +- .../permanent/token/TatsumaDragonToken.java | 4 +- .../TemptWithVengeanceElementalToken.java | 4 +- .../game/permanent/token/TetraviteToken.java | 6 +- .../token/TheLocustGodInsectToken.java | 6 +- .../token/ThopterColorlessToken.java | 1 - .../game/permanent/token/ThopterToken.java | 4 +- .../game/permanent/token/ThrullToken.java | 1 - .../permanent/token/TidalWaveWallToken.java | 4 +- .../permanent/token/TitanForgeGolemToken.java | 2 +- ...itaniaProtectorOfArgothElementalToken.java | 5 +- .../java/mage/game/permanent/token/Token.java | 5 +- .../mage/game/permanent/token/TokenImpl.java | 10 +-- .../permanent/token/TombspawnZombieToken.java | 4 +- .../game/permanent/token/TreasureToken.java | 8 +- .../permanent/token/TreefolkShamanToken.java | 2 +- .../permanent/token/TriskelaviteToken.java | 4 +- .../token/TuktukTheReturnedToken.java | 2 +- .../permanent/token/UktabiKongApeToken.java | 2 +- .../mage/game/permanent/token/UramiToken.java | 4 +- .../token/UtvaraHellkiteDragonToken.java | 5 +- .../permanent/token/ValdukElementalToken.java | 5 +- .../game/permanent/token/VampireToken.java | 4 +- .../token/VoiceOfTheWoodsElementalToken.java | 4 +- .../mage/game/permanent/token/VojaToken.java | 2 +- .../token/VolrathsLaboratoryToken.java | 2 +- .../token/WalkerOfTheGroveToken.java | 2 +- .../mage/game/permanent/token/WallToken.java | 4 +- .../token/WasitoraCatDragonToken.java | 5 +- .../mage/game/permanent/token/WaspToken.java | 4 +- .../game/permanent/token/WaylayToken.java | 2 +- .../mage/game/permanent/token/WeirdToken.java | 4 +- .../token/WhiteBlackSpiritToken.java | 4 +- .../permanent/token/WhiteElementalToken.java | 4 +- .../permanent/token/WingmateRocToken.java | 4 +- .../game/permanent/token/WireflyToken.java | 2 +- .../mage/game/permanent/token/WolfToken.java | 8 +- .../token/WolfTokenWithDeathtouch.java | 4 +- .../permanent/token/WolvesOfTheHuntToken.java | 4 +- .../mage/game/permanent/token/WoodToken.java | 4 +- .../permanent/token/WormHarvestToken.java | 2 +- .../token/WortTheRaidmotherToken.java | 2 +- .../mage/game/permanent/token/Wurm1Token.java | 4 +- .../mage/game/permanent/token/Wurm2Token.java | 4 +- .../mage/game/permanent/token/WurmToken2.java | 5 +- .../mage/game/permanent/token/WurmToken3.java | 3 +- .../permanent/token/XenagosSatyrToken.java | 4 +- .../token/ZendikarsRoilElementalToken.java | 2 +- .../permanent/token/ZombieKnightToken.java | 2 +- .../game/permanent/token/ZombieToken.java | 8 +- .../permanent/token/ZombieWizardToken.java | 2 +- .../token/custom/ElementalCreatureToken.java | 1 + Mage/src/main/java/mage/game/stack/Spell.java | 23 +---- .../main/java/mage/game/stack/SpellStack.java | 4 +- .../java/mage/game/stack/StackAbility.java | 28 ++---- .../java/mage/game/stack/StackObjImpl.java | 6 +- .../java/mage/game/stack/StackObject.java | 1 - .../mage/game/tournament/LimitedOptions.java | 6 +- .../game/tournament/MultiplayerRound.java | 1 - .../java/mage/game/tournament/Tournament.java | 1 - .../mage/game/tournament/TournamentImpl.java | 20 +---- .../game/tournament/TournamentOptions.java | 6 +- .../game/tournament/TournamentPairing.java | 1 - .../game/tournament/TournamentPlayer.java | 4 +- .../TournamentSingleElimination.java | 1 - .../mage/game/tournament/TournamentSwiss.java | 2 +- .../tournament/pairing/RoundPairings.java | 6 +- .../SwissPairingMinimalWeightMatching.java | 9 +- .../pairing/SwissPairingSimple.java | 6 +- .../java/mage/game/turn/BeginCombatStep.java | 1 - .../java/mage/game/turn/BeginningPhase.java | 1 - .../main/java/mage/game/turn/CleanupStep.java | 1 - .../java/mage/game/turn/CombatDamageStep.java | 1 - .../mage/game/turn/DeclareAttackersStep.java | 1 - .../mage/game/turn/DeclareBlockersStep.java | 1 - .../main/java/mage/game/turn/DrawStep.java | 1 - .../java/mage/game/turn/EndOfCombatStep.java | 1 - .../mage/game/turn/FirstCombatDamageStep.java | 1 - Mage/src/main/java/mage/game/turn/Phase.java | 1 - .../mage/game/turn/PreCombatMainStep.java | 1 - Mage/src/main/java/mage/game/turn/Step.java | 1 - Mage/src/main/java/mage/game/turn/Turn.java | 12 +-- .../src/main/java/mage/game/turn/TurnMod.java | 1 - .../main/java/mage/game/turn/TurnMods.java | 1 - .../main/java/mage/game/turn/UntapStep.java | 1 - Mage/src/main/java/mage/players/Library.java | 21 +---- Mage/src/main/java/mage/players/ManaPool.java | 11 +-- .../main/java/mage/players/ManaPoolItem.java | 1 - Mage/src/main/java/mage/players/Player.java | 27 ++---- .../main/java/mage/players/PlayerImpl.java | 86 +++---------------- .../main/java/mage/players/PlayerList.java | 4 +- .../main/java/mage/players/StubPlayer.java | 18 ++-- .../mage/players/net/SkipPrioritySteps.java | 1 - .../main/java/mage/players/net/UserData.java | 6 +- Mage/src/main/java/mage/target/Target.java | 10 +-- .../main/java/mage/target/TargetAmount.java | 12 +-- .../src/main/java/mage/target/TargetCard.java | 10 +-- .../src/main/java/mage/target/TargetImpl.java | 11 +-- .../main/java/mage/target/TargetObject.java | 1 - .../java/mage/target/TargetPermanent.java | 8 +- .../main/java/mage/target/TargetPlayer.java | 1 - .../main/java/mage/target/TargetSource.java | 1 - .../main/java/mage/target/TargetSpell.java | 10 +-- .../java/mage/target/TargetStackObject.java | 8 +- Mage/src/main/java/mage/target/Targets.java | 20 ++--- .../target/common/TargetActivatedAbility.java | 2 +- .../TargetActivatedOrTriggeredAbility.java | 1 - ...tedOrTriggeredAbilityOrLegendarySpell.java | 8 +- .../common/TargetCardInASingleGraveyard.java | 1 - .../mage/target/common/TargetCardInExile.java | 1 - .../target/common/TargetCardInGraveyard.java | 1 - .../TargetCardInGraveyardOrBattlefield.java | 6 +- .../mage/target/common/TargetCardInHand.java | 8 +- .../TargetCardInOpponentsGraveyard.java | 1 - .../common/TargetCardInYourGraveyard.java | 1 - .../common/TargetCreatureOrPlaneswalker.java | 4 +- .../target/common/TargetCreatureOrPlayer.java | 10 +-- .../common/TargetCreaturePermanent.java | 3 +- ...TargetCreaturePermanentSameController.java | 1 - ...etCreaturePermanentWithDifferentTypes.java | 4 +- .../mage/target/common/TargetDefender.java | 1 - .../mage/target/common/TargetDiscard.java | 10 +-- .../TargetOpponentsChoicePermanent.java | 4 +- .../target/common/TargetPermanentAmount.java | 10 +-- .../common/TargetPermanentOrPlayer.java | 8 +- .../common/TargetPermanentOrPlayerAmount.java | 10 +-- .../TargetPermanentOrSuspendedCard.java | 1 - .../target/common/TargetSpellOrPermanent.java | 1 - .../target/common/TargetTriggeredAbility.java | 1 - .../targetpointer/FirstTargetPointer.java | 1 - .../target/targetpointer/FixedTarget.java | 10 +-- .../target/targetpointer/FixedTargets.java | 1 - .../targetpointer/SecondTargetPointer.java | 7 +- .../target/targetpointer/TargetPointer.java | 1 - .../targetpointer/ThirdTargetPointer.java | 1 - Mage/src/main/java/mage/util/CardUtil.java | 37 ++++---- .../src/main/java/mage/util/ClassScanner.java | 8 +- Mage/src/main/java/mage/util/DeckUtil.java | 4 +- Mage/src/main/java/mage/util/JarVersion.java | 4 +- Mage/src/main/java/mage/util/ManaUtil.java | 23 +---- Mage/src/main/java/mage/util/RandomUtil.java | 2 +- Mage/src/main/java/mage/util/SubTypeList.java | 4 +- .../main/java/mage/util/TargetAddress.java | 1 - .../mage/util/functions/AbilityApplier.java | 1 - .../util/functions/AddSubtypeApplier.java | 4 +- .../util/functions/ApplyToMageObject.java | 5 +- .../mage/util/functions/ApplyToPermanent.java | 6 +- .../mage/util/functions/CardTypeApplier.java | 1 - .../util/functions/EmptyApplyToPermanent.java | 1 - .../main/java/mage/util/trace/TraceUtil.java | 9 +- Mage/src/main/java/mage/watchers/Watcher.java | 22 ++--- .../main/java/mage/watchers/WatcherUtils.java | 3 +- .../src/main/java/mage/watchers/Watchers.java | 9 +- ...fDamageAPlayerReceivedThisTurnWatcher.java | 9 +- .../common/AttackedLastTurnWatcher.java | 2 +- .../AttackedOrBlockedThisCombatWatcher.java | 1 - .../common/AttackedThisTurnWatcher.java | 10 +-- .../common/BlockedAttackerWatcher.java | 1 - ...kedByOnlyOneCreatureThisCombatWatcher.java | 7 +- .../common/BlockedThisTurnWatcher.java | 6 +- .../watchers/common/BloodthirstWatcher.java | 2 + .../CardsAmountDrawnThisTurnWatcher.java | 8 +- ...CardsCycledOrDiscardedThisTurnWatcher.java | 2 +- .../CardsDrawnDuringDrawStepWatcher.java | 9 +- .../common/CardsDrawnThisTurnWatcher.java | 8 +- .../common/CardsPutIntoGraveyardWatcher.java | 1 + .../common/CastFromGraveyardWatcher.java | 8 +- .../watchers/common/CastFromHandWatcher.java | 1 - .../common/CastSpellLastTurnWatcher.java | 9 +- .../common/CastSpellYourLastTurnWatcher.java | 9 +- .../watchers/common/CommanderInfoWatcher.java | 1 - .../common/CommanderPlaysCountWatcher.java | 8 +- .../CreatureAttackedWhichPlayerWatcher.java | 9 +- .../common/CreatureWasCastWatcher.java | 1 - .../watchers/common/CreaturesDiedWatcher.java | 8 +- .../watchers/common/DamageDoneWatcher.java | 8 +- ...heBattlefieldWhileSpellWasCastWatcher.java | 8 +- .../common/FirstSpellCastThisTurnWatcher.java | 1 - .../watchers/common/GravestormWatcher.java | 1 + .../mage/watchers/common/LandfallWatcher.java | 8 +- .../LifeLossOtherFromCombatWatcher.java | 1 - .../mage/watchers/common/MiracleWatcher.java | 8 +- ...rOfTimesPermanentTargetedATurnWatcher.java | 1 - .../PermanentsEnteredBattlefieldWatcher.java | 6 +- ...EnteredBattlefieldYourLastTurnWatcher.java | 8 +- .../common/PermanentsSacrificedWatcher.java | 6 +- .../watchers/common/PlanarRollWatcher.java | 9 +- .../mage/watchers/common/PlayLandWatcher.java | 8 +- .../common/PlayerAttackedStepWatcher.java | 1 - .../common/PlayerCastCreatureWatcher.java | 8 +- .../common/PlayerDamagedBySourceWatcher.java | 1 - .../common/PlayerGainedLifeWatcher.java | 1 + .../PlayerLostLifeNonCombatWatcher.java | 9 +- .../common/PlayerLostLifeWatcher.java | 9 +- .../PlayersAttackedLastTurnWatcher.java | 2 +- .../PlayersAttackedThisTurnWatcher.java | 8 +- .../mage/watchers/common/ProwlWatcher.java | 10 +-- .../mage/watchers/common/RevoltWatcher.java | 8 +- .../common/SourceDidDamageWatcher.java | 6 +- .../watchers/common/SpellsCastWatcher.java | 6 +- .../common/WasBlockedThisTurnWatcher.java | 6 +- .../java/mage/ContinuousEffectImplTest.java | 13 ++- Mage/src/test/java/mage/ManaSymbolTest.java | 6 +- Mage/src/test/java/mage/ManaTest.java | 14 ++- .../exporter/MtgOnlineDeckExporterTest.java | 9 +- .../decks/exporter/XmageDeckExporterTest.java | 9 +- .../decks/importer/DraftLogImporterTest.java | 5 +- .../decks/importer/MtgaImporterTest.java | 7 +- .../decks/importer/MwsDeckImportTest.java | 5 ++ .../cards/decks/importer/TestDeckChecker.java | 2 + .../test/java/mage/counters/CounterTest.java | 4 +- 1284 files changed, 2136 insertions(+), 3512 deletions(-) diff --git a/Mage/src/main/java/mage/ConditionalMana.java b/Mage/src/main/java/mage/ConditionalMana.java index 41432c828a..86a378e12a 100644 --- a/Mage/src/main/java/mage/ConditionalMana.java +++ b/Mage/src/main/java/mage/ConditionalMana.java @@ -1,10 +1,5 @@ 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; @@ -14,6 +9,11 @@ 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 3f1fc8652d..9507918a8c 100644 --- a/Mage/src/main/java/mage/MageInt.java +++ b/Mage/src/main/java/mage/MageInt.java @@ -1,11 +1,11 @@ package mage; -import java.io.Serializable; -import java.util.Objects; - import mage.util.CardUtil; import mage.util.Copyable; +import java.io.Serializable; +import java.util.Objects; + 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 b840f0bac7..744ec43f07 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -1,10 +1,5 @@ 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; @@ -20,6 +15,12 @@ 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 c526e94439..b68592bb6b 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -1,12 +1,5 @@ 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; @@ -21,17 +14,15 @@ import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.text.TextPart; import mage.abilities.text.TextPartSubType; import mage.cards.FrameStyle; -import mage.constants.CardType; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.SubTypeSet; -import mage.constants.SuperType; +import mage.constants.*; 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 47720d1f21..a4f2a81302 100644 --- a/Mage/src/main/java/mage/MageObjectReference.java +++ b/Mage/src/main/java/mage/MageObjectReference.java @@ -1,16 +1,15 @@ 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 5a8d9a86d0..f6a594292f 100644 --- a/Mage/src/main/java/mage/Mana.java +++ b/Mage/src/main/java/mage/Mana.java @@ -2,13 +2,11 @@ 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 7100e91bf8..0d1000d172 100644 --- a/Mage/src/main/java/mage/abilities/Abilities.java +++ b/Mage/src/main/java/mage/abilities/Abilities.java @@ -5,7 +5,6 @@ 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 3c2a6b9984..d389a5ac15 100644 --- a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java @@ -1,16 +1,5 @@ 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; @@ -19,6 +8,10 @@ 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 b232159b3a..dd5b811f84 100644 --- a/Mage/src/main/java/mage/abilities/Ability.java +++ b/Mage/src/main/java/mage/abilities/Ability.java @@ -1,9 +1,5 @@ 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; @@ -13,11 +9,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.abilities.hint.Hint; -import mage.constants.AbilityType; -import mage.constants.AbilityWord; -import mage.constants.EffectType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Controllable; import mage.game.Game; import mage.game.events.GameEvent; @@ -28,6 +20,10 @@ 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 bb74a6594c..7fcb21e585 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -1,26 +1,9 @@ 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.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.*; import mage.abilities.costs.common.PayLifeCost; -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.costs.mana.*; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; @@ -29,12 +12,7 @@ import mage.abilities.hint.Hint; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.Card; import mage.cards.SplitCard; -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.constants.*; import mage.game.Game; import mage.game.command.Emblem; import mage.game.command.Plane; @@ -49,6 +27,12 @@ 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 4385ee3ae8..4601964969 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbility.java @@ -1,7 +1,6 @@ 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 f2477ce7d3..d54e2f27eb 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -1,7 +1,6 @@ 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 f59a15fce4..bed1acb2fe 100644 --- a/Mage/src/main/java/mage/abilities/ActivationInfo.java +++ b/Mage/src/main/java/mage/abilities/ActivationInfo.java @@ -2,7 +2,6 @@ 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 bf86a4cc40..c1d4d0e7f0 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 5140033aeb..2acae73141 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 3eb1254d6f..f05cb990d9 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -1,13 +1,5 @@ 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; @@ -19,6 +11,8 @@ 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 15c685e76d..4fc440012e 100644 --- a/Mage/src/main/java/mage/abilities/PlayLandAbility.java +++ b/Mage/src/main/java/mage/abilities/PlayLandAbility.java @@ -1,7 +1,6 @@ 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 2e4ec219ac..9bd506f34a 100644 --- a/Mage/src/main/java/mage/abilities/SpellAbility.java +++ b/Mage/src/main/java/mage/abilities/SpellAbility.java @@ -2,7 +2,6 @@ package mage.abilities; import java.util.Optional; import java.util.UUID; - import mage.MageObject; import mage.MageObjectReference; import mage.abilities.costs.Cost; @@ -12,12 +11,7 @@ import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.keyword.FlashAbility; import mage.cards.Card; import mage.cards.SplitCard; -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.constants.*; 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 a56d1d6da3..ae45a834e8 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 e729d8008d..d354a44835 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java @@ -2,14 +2,8 @@ package mage.abilities; -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.*; 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 afef0620ca..516861ec3b 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbility.java @@ -2,7 +2,6 @@ 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 2984669a4b..e037461998 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -1,8 +1,5 @@ package mage.abilities; -import java.util.Locale; -import java.util.UUID; - import mage.MageObject; import mage.abilities.effects.Effect; import mage.constants.AbilityType; @@ -14,6 +11,9 @@ 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 86675d9247..62c78b6791 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.TargetController; import mage.constants.Zone; +import mage.constants.TargetController; /** * diff --git a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java index eddff46c57..89c0741a67 100644 --- a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java @@ -2,7 +2,6 @@ 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 78e7e04955..c290a39cc2 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java @@ -1,7 +1,6 @@ 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 be82cb919c..f88cf4762e 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java @@ -3,13 +3,12 @@ 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; import mage.game.events.GameEvent.EventType; +import mage.game.events.GameEvent; 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 5024b7d020..4d8c1289fb 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java @@ -2,7 +2,6 @@ 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 cb5d93b6e9..c9b3bb3291 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java @@ -2,7 +2,6 @@ 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 b9800c2e0b..6bae81f1d4 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java @@ -6,7 +6,6 @@ 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 0836744172..156e8181dc 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 70e5b64dbc..c5c72c1483 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 8de4bb14f6..c7430f2792 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; import mage.game.events.GameEvent.EventType; +import mage.game.events.GameEvent; 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 e313dc77d1..64b008afc3 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 8ea6a953b8..3ece2bd954 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -1,7 +1,6 @@ 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 2ea34a3907..39b13ac515 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java @@ -8,7 +8,11 @@ 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 bba831fd40..7969e308b5 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java @@ -1,8 +1,6 @@ package mage.abilities.common; -import java.util.Locale; - import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.TargetController; @@ -12,6 +10,8 @@ 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 ea81d70094..76bee0ed4e 100644 --- a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java @@ -1,8 +1,6 @@ package mage.abilities.common; -import java.util.UUID; - import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.constants.Zone; @@ -12,6 +10,9 @@ 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 7bf04adcc2..353271ab18 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 f4650691a8..7cdaaab696 100644 --- a/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java @@ -2,7 +2,6 @@ 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 77aa21a720..97bbbf68cc 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 8cd671098b..4ade93c758 100644 --- a/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ControllerAssignCombatDamageToBlockersAbility.java @@ -1,10 +1,11 @@ package mage.abilities.common; -import java.io.ObjectStreamException; - import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; + +import java.io.ObjectStreamException; + 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 1be1e40da3..43814052e2 100644 --- a/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ControllerDivideCombatDamageAbility.java @@ -1,10 +1,11 @@ package mage.abilities.common; -import java.io.ObjectStreamException; - import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; + +import java.io.ObjectStreamException; + 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 67329f2995..1e969f3f1f 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 a55cb131c9..3725594499 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 4e16e40106..07c4fd604e 100644 --- a/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java @@ -1,10 +1,11 @@ package mage.abilities.common; -import java.io.ObjectStreamException; - import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; + +import java.io.ObjectStreamException; + 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 43dd385f5f..b52fe3d4b7 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 1a526aca6b..faa6551756 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 7ff2a7dcd1..fe1d1969a0 100644 --- a/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealtDamageAttachedTriggeredAbility.java @@ -2,14 +2,13 @@ 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; import mage.game.events.GameEvent.EventType; +import mage.game.events.GameEvent; 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 5ede42a168..3a7125f87a 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java @@ -2,7 +2,6 @@ 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 311084f679..0d281622b9 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksAllTriggeredAbility.java @@ -2,7 +2,6 @@ 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 3b0407a302..3a22fd189c 100644 --- a/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java @@ -1,9 +1,5 @@ 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; @@ -17,6 +13,10 @@ 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 04eb10a546..1e477edf74 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -2,11 +2,6 @@ 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; @@ -22,6 +17,11 @@ 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 10065d763a..84aef8d67f 100644 --- a/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FirstSpellOpponentsTurnTriggeredAbility.java @@ -1,7 +1,5 @@ package mage.abilities.common; -import java.util.List; - import mage.abilities.effects.Effect; import mage.filter.FilterSpell; import mage.game.Game; @@ -9,6 +7,8 @@ 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 9f621f4650..7ce2028a91 100644 --- a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java @@ -2,7 +2,6 @@ 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 ddd7293cf1..09debf4d12 100644 --- a/Mage/src/main/java/mage/abilities/common/LicidAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LicidAbility.java @@ -3,7 +3,6 @@ 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 9d7a33c74d..08ebb1608a 100644 --- a/Mage/src/main/java/mage/abilities/common/PassAbility.java +++ b/Mage/src/main/java/mage/abilities/common/PassAbility.java @@ -2,7 +2,6 @@ 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 c537ecebbf..9fac7a0a94 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; import mage.game.events.GameEvent.EventType; +import mage.game.events.GameEvent; 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 437c930858..9e07b93522 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.ConditionalInterveningIfTriggeredAbility; import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; 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 cfef1b4d8a..ad64d77eb8 100644 --- a/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java +++ b/Mage/src/main/java/mage/abilities/common/SignatureSpellCastOnlyWithOathbreakerEffect.java @@ -1,7 +1,5 @@ package mage.abilities.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -10,6 +8,8 @@ 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 ff1e17a03b..069e381bfb 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 06f8248b88..2ca4e134b5 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 de8e09a9e8..83fe71cfbc 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 541969ad32..193f731548 100644 --- a/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java +++ b/Mage/src/main/java/mage/abilities/common/WhileSearchingPlayFromLibraryAbility.java @@ -1,10 +1,11 @@ package mage.abilities.common; -import java.io.ObjectStreamException; - import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; + +import java.io.ObjectStreamException; + 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 228c2c5993..8ec64e7760 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java @@ -2,7 +2,6 @@ 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 e8c9d49251..1bb565531a 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 3bf52f45f1..9a6e077d36 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 java.util.ArrayList; -import java.util.Arrays; - import mage.abilities.Ability; import mage.game.Game; +import java.util.ArrayList; +import java.util.Arrays; + /** * 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 c6f26b879c..512d372000 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 e1469acd4c..0d5bb3f6ca 100644 --- a/Mage/src/main/java/mage/abilities/condition/OrCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/OrCondition.java @@ -3,7 +3,6 @@ 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 8246a0c830..4e45cdf04f 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/AdamantCondition.java @@ -1,7 +1,5 @@ package mage.abilities.condition.common; -import java.util.Arrays; - import mage.Mana; import mage.abilities.Ability; import mage.abilities.condition.Condition; @@ -10,6 +8,8 @@ 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 f59bff652c..4bc9f34d73 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 87f76c8119..85dbe804db 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.abilities.condition.Condition; import mage.constants.ComparisonType; +import mage.abilities.condition.Condition; 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 2577422596..2b7edf0f57 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.abilities.condition.Condition; import mage.constants.ComparisonType; +import mage.abilities.condition.Condition; 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 17e4e265b0..5a683073b8 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 47d7c43131..28e8f13ca8 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java @@ -1,7 +1,5 @@ package mage.abilities.condition.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.CommanderCardType; @@ -9,6 +7,8 @@ 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 e1917a2378..8558104f94 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java @@ -5,7 +5,6 @@ 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 a7e34c87b5..2e5d8665a4 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java @@ -5,7 +5,6 @@ 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 6e4b4787ba..87b79fe88b 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentGreatestCMCCondition.java @@ -9,7 +9,6 @@ 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 0ac295a32c..2124fb47d7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java @@ -2,7 +2,6 @@ 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 a1f31d7a3c..6b2686030d 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CreatureCountCondition.java @@ -6,7 +6,6 @@ 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 6891406364..57e4830640 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java @@ -2,7 +2,6 @@ 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 018e90747e..6b70944259 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java @@ -2,7 +2,6 @@ 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 a5e9f2e24a..9ce29ee62d 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 70d531e82d..c483023f88 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java @@ -2,7 +2,6 @@ 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 9e1dd2029d..d1d5ae98ce 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java @@ -1,8 +1,6 @@ package mage.abilities.condition.common; -import java.util.EnumSet; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.SuperType; @@ -10,6 +8,8 @@ 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 ef97a64786..259b3cff3a 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 0bc9fe2714..cdcd889f8f 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 44457ab1c6..becf859c42 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.abilities.condition.Condition; import mage.constants.ComparisonType; +import mage.abilities.condition.Condition; 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 57588acce0..45dbbb1ba2 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 45151ae60f..f6b939cc6e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java @@ -4,6 +4,7 @@ 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 ce3ca10452..d2d873d523 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 02d5463a9f..42b2b2d854 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java @@ -2,7 +2,6 @@ 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 20c8e8e103..ad26f8a79d 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OathbreakerOnBattlefieldCondition.java @@ -1,10 +1,5 @@ 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; @@ -15,6 +10,11 @@ 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 b9b5329925..36b8354885 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 41ad8ded6e..93139b21da 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java @@ -3,7 +3,6 @@ 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 eb2ebe3326..25b98e853c 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.abilities.condition.Condition; import mage.constants.ComparisonType; +import mage.abilities.condition.Condition; 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 9d76df0e58..5ea4d9a613 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 7a561d7669..c509ebabc1 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.abilities.condition.IntCompareCondition; import mage.constants.ComparisonType; +import mage.abilities.condition.IntCompareCondition; 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 944a6c1d13..0e434224cf 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 java.util.List; - import mage.abilities.Ability; -import mage.abilities.condition.Condition; import mage.constants.ComparisonType; +import mage.abilities.condition.Condition; import mage.counters.CounterType; -import mage.filter.FilterPermanent; import mage.game.Game; +import mage.filter.FilterPermanent; import mage.game.permanent.Permanent; +import java.util.List; + /** * @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 337d913bdc..1636d31988 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java @@ -2,7 +2,6 @@ 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 d80b59a75d..b4d46d2ade 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java @@ -3,7 +3,6 @@ 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 7c43f6c639..8229c46436 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldOrCommandZoneCondition.java @@ -3,7 +3,6 @@ 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 83880e735a..098b5a7e20 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceTappedBeforeUntapStepCondition.java @@ -2,8 +2,6 @@ package mage.abilities.condition.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.constants.PhaseStep; @@ -12,6 +10,8 @@ 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 49d73ec70b..b4e3697752 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java @@ -1,7 +1,5 @@ package mage.abilities.condition.common; -import java.util.Iterator; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; @@ -10,6 +8,8 @@ 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 d57b7e3d7e..8082411944 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 f14d81f41a..f15a8906ca 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 bffcc98f35..dcdd6a8162 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 1e1cb79184..2a0837cf6f 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 fce1f55782..d8ab429719 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.abilities.condition.IntCompareCondition; import mage.constants.ComparisonType; +import mage.abilities.condition.IntCompareCondition; 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 60ff46c011..25ba6f8f4f 100644 --- a/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java +++ b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java @@ -1,8 +1,6 @@ package mage.abilities.costs; -import java.util.Iterator; - import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; @@ -17,6 +15,8 @@ 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 b31a511852..d4d38a1a66 100644 --- a/Mage/src/main/java/mage/abilities/costs/CompositeCost.java +++ b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java @@ -1,7 +1,6 @@ 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 2474eee861..af3ffa182a 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 8fbefc83be..1712104708 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostImpl.java @@ -2,7 +2,6 @@ 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 eb82cd4295..f4f1c1acae 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java @@ -4,7 +4,6 @@ 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 f40ac88e64..df79fe8127 100644 --- a/Mage/src/main/java/mage/abilities/costs/OrCost.java +++ b/Mage/src/main/java/mage/abilities/costs/OrCost.java @@ -2,7 +2,6 @@ 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 169581800b..6d38676d0d 100644 --- a/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java @@ -1,7 +1,5 @@ package mage.abilities.costs; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.mana.ManaAbility; import mage.game.Game; @@ -10,6 +8,8 @@ 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 f89a7c759f..64d6974a66 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 4382f0cdc9..522b5943fb 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/CyclingDiscardCost.java @@ -8,7 +8,6 @@ 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 62f35e2bbb..4023d942b4 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java @@ -3,7 +3,6 @@ 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 8736ffc002..225f97a10f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java @@ -2,8 +2,6 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -11,6 +9,8 @@ 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 fedb3be4eb..ff190e15cb 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java @@ -4,7 +4,6 @@ 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 1c3408d219..d98d8f81bf 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/DynamicValueGenericManaCost.java @@ -1,7 +1,5 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -9,6 +7,8 @@ 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 6fdae7f227..957921b67f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExertSourceCost.java @@ -2,7 +2,6 @@ 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 e0fef6bcc4..dd70b3866b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java @@ -4,7 +4,6 @@ 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 c51d614a4d..5074791ef4 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java @@ -1,9 +1,5 @@ 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; @@ -17,6 +13,10 @@ 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 2f83a2c267..b9ae752cf5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java @@ -2,7 +2,6 @@ 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 490e28267a..c427b5bf8c 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java @@ -2,7 +2,6 @@ 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 0d9e255faa..38045a9cf8 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java @@ -6,7 +6,6 @@ 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 cc932891a1..5e460a9b44 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java @@ -2,7 +2,6 @@ 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 240ffb7c32..0cf07fb3bd 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java @@ -2,7 +2,6 @@ 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 2037e759ef..b4039fdf83 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java @@ -5,7 +5,6 @@ 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 8644f6e92c..dfb871086e 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java @@ -6,7 +6,6 @@ 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 c13597db2c..7d2087ab50 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java @@ -6,7 +6,6 @@ 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 642bcd060c..b91407c646 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java @@ -7,7 +7,6 @@ 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 d68bb5e85b..4a9219cff3 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java @@ -2,7 +2,6 @@ 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 915aa5cd1e..9f02bc3052 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java @@ -2,7 +2,6 @@ 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 f2c09f12d2..18c902d5af 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java @@ -1,7 +1,5 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -10,6 +8,8 @@ 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 3c4e46fd2b..55ea9f43f8 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java @@ -1,8 +1,6 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -10,6 +8,8 @@ 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 0d4f0fe4a1..4a68096e26 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java @@ -3,7 +3,6 @@ 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 e90c5d69fe..bd23597969 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutCardFromHandOnTopOfLibraryCost.java @@ -5,8 +5,6 @@ */ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -17,6 +15,8 @@ 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 f95c32c8b8..2d0abb26c3 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java @@ -2,7 +2,6 @@ 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 478cd84e75..a49b52480c 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutSourceOnBottomOwnerLibraryCost.java @@ -2,7 +2,6 @@ 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 1d78cd749c..232961e449 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java @@ -4,7 +4,6 @@ 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 bb996d98e2..ab1196345f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java @@ -1,9 +1,5 @@ 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; @@ -18,6 +14,10 @@ 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 e44cae1677..b3179e3e8f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -3,7 +3,6 @@ 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 8dc57fa96e..bb7cc92138 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java @@ -3,7 +3,6 @@ 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 c5efad1f6c..b88a5e445e 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java @@ -4,7 +4,6 @@ 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 c8d7591859..1ca025b51e 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromBattlefieldSourceCost.java @@ -2,7 +2,6 @@ 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 4a9a8d0f9c..8771dcae91 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java @@ -4,7 +4,6 @@ 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 edc89eb8e9..c91c60c9b7 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java @@ -2,7 +2,6 @@ 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 077914403a..daf8d54be5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealSecretOpponentCost.java @@ -1,7 +1,5 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.Cost; @@ -11,6 +9,8 @@ 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 06c1789c09..76659ce7e0 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java @@ -2,7 +2,6 @@ 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 861896ce0a..4bd6860634 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java @@ -5,7 +5,6 @@ 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 70580e489f..9e9c62345e 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java @@ -4,7 +4,6 @@ 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 202f099281..616e65026b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAttachedCost.java @@ -2,7 +2,6 @@ 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 f3b1e32e01..d2e101e25e 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java @@ -2,7 +2,6 @@ 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 691b83b10b..51644679b5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java @@ -1,10 +1,6 @@ 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; @@ -16,6 +12,10 @@ 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 b84ab887c9..7dcfa10311 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapAttachedCost.java @@ -2,7 +2,6 @@ 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 b5d74c0120..3526217924 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java @@ -2,7 +2,6 @@ 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 5bb5235d2f..0496b89944 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java @@ -1,7 +1,5 @@ package mage.abilities.costs.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -11,6 +9,8 @@ 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 9a4325e183..9cdc11a23a 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UnattachCost.java @@ -1,7 +1,6 @@ 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 3da4e19455..3a808c48ac 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java @@ -2,7 +2,6 @@ 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 149ed3db1d..27bf912ba4 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 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.abilities.Ability; +import mage.abilities.costs.CostImpl; 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 53096542e3..0db245fa8d 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java @@ -3,7 +3,6 @@ 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 d2a6da939c..6706717782 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java @@ -2,7 +2,6 @@ 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 87588a4cbd..afbab56ea0 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java @@ -1,9 +1,5 @@ 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; @@ -18,6 +14,10 @@ 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 0b48704acc..6aea5f0101 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 8f67d04b15..a66d7a5702 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -1,12 +1,5 @@ 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; @@ -26,6 +19,8 @@ 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 271ede4a18..877d21c55b 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java @@ -2,13 +2,14 @@ package mage.abilities.costs.mana; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.Map; - import mage.ManaSymbol; import mage.constants.ColoredManaSymbol; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + /** * 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 c7c7440afa..e7c15468e3 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java @@ -1,8 +1,5 @@ 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; @@ -10,6 +7,9 @@ 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 7e6b8bfe11..9685b3fd69 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java @@ -1,12 +1,5 @@ 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; @@ -14,12 +7,14 @@ import mage.abilities.condition.FixedCondition; import mage.abilities.condition.LockedInCondition; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.DependencyType; -import mage.constants.Duration; -import mage.constants.EffectType; -import mage.constants.Layer; -import mage.constants.SubLayer; +import mage.constants.*; 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 13f3027a18..cc8a43a6f4 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java @@ -2,7 +2,6 @@ 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 e389b7d7bd..7b34d3f941 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java @@ -1,7 +1,5 @@ package mage.abilities.decorator; -import java.util.List; - import mage.abilities.Modes; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -13,6 +11,8 @@ 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 afb1f37f4c..9928d870e8 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java @@ -1,7 +1,6 @@ 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 beec7bf689..148be62172 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java @@ -1,7 +1,5 @@ package mage.abilities.decorator; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.condition.FixedCondition; @@ -12,6 +10,8 @@ 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 e12b7deacd..f3e347292f 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java @@ -1,7 +1,5 @@ package mage.abilities.decorator; -import java.util.List; - import mage.abilities.Modes; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; @@ -13,6 +11,8 @@ 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 0c3e082f26..bd488c7cf5 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/AdditiveDynamicValue.java @@ -3,7 +3,6 @@ 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 4e66d277b6..7a3180a90f 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 9bddbb3391..5cee8d7544 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingFilterCreatureCount.java @@ -2,7 +2,6 @@ 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 1ab3ab1e07..02816bd5f1 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java @@ -3,7 +3,6 @@ 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 383f56231a..32b2d55318 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypesInGraveyardCount.java @@ -1,7 +1,5 @@ package mage.abilities.dynamicvalue.common; -import java.util.EnumSet; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -10,6 +8,8 @@ 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 8110874fb7..72cd99216c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java @@ -1,7 +1,6 @@ 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 c09c0f69b6..5910f57a6c 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 abc20df41f..1bc24e1aa6 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java @@ -6,7 +6,6 @@ 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 a849843181..2663f6a040 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java @@ -3,7 +3,6 @@ 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 b63d3fb62a..97cb299f60 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java @@ -1,10 +1,5 @@ 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; @@ -17,6 +12,11 @@ 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 ca6d55c1e4..cdb7d1360b 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java @@ -1,7 +1,5 @@ package mage.abilities.dynamicvalue.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -9,6 +7,8 @@ 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 b6aa8340a8..f87d0fa045 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java @@ -1,9 +1,6 @@ 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; @@ -11,6 +8,9 @@ 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 68b07a9ba6..fe7203deaf 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java @@ -1,13 +1,17 @@ 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 e81c7a7315..8989267cc2 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GreatestPowerAmongControlledCreaturesValue.java @@ -7,6 +7,7 @@ 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 6a695e2a3d..5a566ef04f 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 c1c0684438..76f16fe6ad 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java @@ -1,8 +1,5 @@ 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; @@ -10,6 +7,9 @@ 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 8f8ac2c135..e9ee81f4ce 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java @@ -3,7 +3,6 @@ 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 dd0d6af8fb..981792a69c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java @@ -2,7 +2,6 @@ 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 4b0aef0032..3a98ec1d65 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 50f5cf5c4f..14a21180aa 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java @@ -2,8 +2,6 @@ package mage.abilities.dynamicvalue.common; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -11,6 +9,8 @@ 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 85ed05e051..360034367d 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 498356064b..c5d726167e 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java @@ -2,8 +2,6 @@ package mage.abilities.dynamicvalue.common; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -11,6 +9,8 @@ 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 687e99bfc5..61d76e0215 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 942c768730..1c58869db3 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java @@ -2,7 +2,6 @@ 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 4ffe0728a7..a21b0e3a25 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java @@ -1,7 +1,5 @@ package mage.abilities.effects; -import java.util.UUID; - import mage.abilities.Ability; import mage.constants.AsThoughEffectType; import mage.constants.Duration; @@ -9,6 +7,8 @@ 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 0cd3fab030..54ac888207 100644 --- a/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java @@ -2,7 +2,6 @@ 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 a18bbf36bd..2369835049 100644 --- a/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java @@ -1,18 +1,12 @@ 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.Duration; -import mage.constants.Outcome; -import mage.constants.SpellAbilityType; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -23,6 +17,8 @@ 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 c05a810870..cdea7ccc33 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java @@ -1,10 +1,5 @@ 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; @@ -14,6 +9,11 @@ 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 de7f6b523e..7e1cfad748 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java @@ -1,12 +1,5 @@ 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; @@ -16,15 +9,7 @@ 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.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.constants.*; import mage.filter.Filter; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -34,6 +19,8 @@ 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 68243a95b3..46708c0d2a 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java @@ -1,23 +1,5 @@ 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; @@ -26,22 +8,8 @@ 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.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.cards.*; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -56,6 +24,12 @@ 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 68f95c0448..26e9288654 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java @@ -1,15 +1,5 @@ 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; @@ -18,6 +8,9 @@ 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 4c42f5a285..07312ebdf1 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effect.java +++ b/Mage/src/main/java/mage/abilities/effects/Effect.java @@ -1,8 +1,5 @@ package mage.abilities.effects; -import java.io.Serializable; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.constants.EffectType; @@ -10,6 +7,9 @@ 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 44601c2509..65e0bbada8 100644 --- a/Mage/src/main/java/mage/abilities/effects/EffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java @@ -1,9 +1,5 @@ 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; @@ -11,6 +7,10 @@ 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 ae42438618..8d3d81db54 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 af5a9a15a6..2257545f9e 100644 --- a/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java @@ -3,7 +3,6 @@ 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 fa1255c6e1..a0ea829739 100644 --- a/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java @@ -2,7 +2,6 @@ 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 a07fbdc44b..54a873fb9c 100644 --- a/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java @@ -1,7 +1,6 @@ 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 dcd535ebf9..cee84d732b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AddCombatAndMainPhaseEffect.java @@ -2,7 +2,6 @@ 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 daba5dfbdd..963a4fc4b8 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 5f74e795a6..81eab7e767 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java @@ -5,9 +5,6 @@ */ 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; @@ -26,6 +23,9 @@ 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 a0b4931c40..aea698d141 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 80d555f013..2725b18636 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CanBlockAsThoughtItHadShadowEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; @@ -9,6 +7,8 @@ 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 986cb862ae..ea38ed4076 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java @@ -2,7 +2,6 @@ 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 74dba0b628..c51b17ab5c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java @@ -2,7 +2,6 @@ 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 89ef6f4056..4354f0904d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java @@ -6,7 +6,6 @@ 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 df8496f297..c1bdd3f9f4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java @@ -2,7 +2,6 @@ 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 c436aa24ff..8100a81ac6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseExpansionSetEffect.java @@ -4,7 +4,6 @@ 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 3e50671319..a078a57c80 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java @@ -5,8 +5,6 @@ */ package mage.abilities.effects.common; -import java.util.stream.Collectors; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -19,6 +17,8 @@ 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 1563422f5c..5189e93f9a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java @@ -4,7 +4,6 @@ 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 ec659221dc..72b22fc266 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java @@ -1,13 +1,12 @@ 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; @@ -20,6 +19,8 @@ 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 4b81ea7ab3..182b6e583f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.io.ObjectStreamException; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.MageSingleton; @@ -20,6 +18,8 @@ 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 ae8a1861e4..d75fda572e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -1,27 +1,19 @@ 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.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.constants.*; 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 a2327fc37a..3485c7c4f9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -21,6 +19,8 @@ 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 34f8667514..dccf10bc17 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java @@ -1,14 +1,5 @@ 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; @@ -26,6 +17,8 @@ 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 1472f5eec7..63b3018d23 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -2,13 +2,7 @@ package mage.abilities.effects.common; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; 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 b8259d7ff7..87ab736ab1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java @@ -1,7 +1,6 @@ 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 e6e978033f..86ac6ae39f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java @@ -3,7 +3,6 @@ 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 e4569569fd..144bb81b44 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java @@ -2,7 +2,6 @@ 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 f06a9a2b86..acc93941dc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenCopyTargetEffect.java @@ -1,9 +1,5 @@ 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; @@ -15,11 +11,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.EmptyToken; @@ -28,6 +20,10 @@ 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 f755b8fc73..0ee482597c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java @@ -1,10 +1,6 @@ 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; @@ -19,6 +15,10 @@ 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 989dbc1680..d74b91930b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -7,6 +7,7 @@ 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 c27f5ce75c..ac3bf171bb 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 3267ed0723..8dffba358d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java @@ -2,7 +2,6 @@ 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 692b425e51..1977287239 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 86546494e0..54db753781 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java @@ -1,8 +1,5 @@ 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; @@ -14,6 +11,9 @@ 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 4c30b4ab80..9dc0f94e17 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java @@ -1,9 +1,5 @@ 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; @@ -16,6 +12,10 @@ 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 3e34399d26..01d581c38e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -11,6 +9,8 @@ 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 df5c59ac8b..31e471ad78 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 4c19f56d95..d4db66bb45 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -14,6 +12,8 @@ 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 58cc9b8e58..b55a48f3e9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllAttachedEquipmentEffect.java @@ -3,7 +3,6 @@ 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 df2a3ff9e8..ef48171843 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 5220091b2b..6d83315585 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyEquippedEffect.java @@ -6,7 +6,6 @@ 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 d640ad1197..3a8f2b90ab 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java @@ -3,11 +3,10 @@ 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 e9f5bc6cbf..6ac8f7ab1c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -13,6 +11,8 @@ 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 d721048074..99c5c5b07b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java @@ -1,9 +1,5 @@ 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; @@ -16,6 +12,10 @@ 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 cd11ab1b02..b4e169e807 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -16,6 +14,8 @@ 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 11d715c989..d2d8a6a7d2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java @@ -1,10 +1,5 @@ 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; @@ -22,6 +17,11 @@ 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 05549fd015..d231598bf0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.Locale; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -15,6 +13,8 @@ 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 78ea5e4c00..28d2dda59d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -17,6 +15,8 @@ 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 65a47bfa0c..41200f26f0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java @@ -4,7 +4,6 @@ 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 14c722f5ba..dbc5aa6ad1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java @@ -1,7 +1,6 @@ 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 29bfd1c5e6..0e87c451e8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java @@ -2,7 +2,6 @@ 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 947479157b..c56ae3840b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java @@ -1,7 +1,6 @@ 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 fdc0c3a9fb..0bec69cbc8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java @@ -2,7 +2,6 @@ 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 3924e6b55a..2d3a8c5639 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java @@ -5,14 +5,13 @@ */ 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 aed524617e..486bbe1296 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java @@ -1,10 +1,6 @@ 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; @@ -15,6 +11,10 @@ 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 7f08636806..cd58b7ac8c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java @@ -5,7 +5,6 @@ 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 dfd4613d3c..9c664bbf25 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAdventureSpellEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.effects.AsThoughEffectImpl; @@ -19,6 +17,8 @@ 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 9bea860b3d..271d004bf4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java @@ -3,10 +3,9 @@ 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 b88d11376d..f2f8de4a1f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -13,6 +11,8 @@ 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 2aa6741d51..8f4aed65f2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java @@ -3,7 +3,6 @@ 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 fdd4664616..b3d65f8775 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java @@ -2,7 +2,6 @@ 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 f6bbc68253..4c8858e67c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java @@ -4,7 +4,6 @@ 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 60d5be3037..0410d7af38 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java @@ -2,7 +2,6 @@ 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 3f3b5062bb..eadcce35a4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceUnlessPaysEffect.java @@ -2,7 +2,6 @@ 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 c0777c601a..edff90134b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java @@ -2,7 +2,6 @@ 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 c051ba2433..0d1285a3f9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java @@ -3,7 +3,6 @@ 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 6ef3475503..bee973d554 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java @@ -1,9 +1,5 @@ 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; @@ -16,6 +12,10 @@ 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 2ec8e9b27d..22fdb166fe 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -10,6 +8,8 @@ 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 cca57cad01..105097a667 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 dcbcec7522..98210835fb 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 java.util.UUID; - +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; +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 1242d9f8af..527a1f1c90 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java @@ -2,7 +2,6 @@ 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 9e89b72bb1..a99b93a6f3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.stream.Collectors; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -11,6 +9,8 @@ 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 8bfdd00956..82e095daec 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java @@ -1,8 +1,5 @@ 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; @@ -14,6 +11,9 @@ 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 9a4a26e954..d3b3681f2f 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 8deb723642..9dca85f406 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -29,10 +29,6 @@ */ 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; @@ -47,6 +43,10 @@ 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 553fba6175..01bb92c2ee 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 ad8b94b501..0707a45334 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 97f09080f3..6c009e9ed3 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 db108f0845..93c03a7146 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java @@ -1,7 +1,6 @@ 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 42f2dc773e..01e7308f02 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java @@ -1,8 +1,5 @@ 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; @@ -15,6 +12,9 @@ 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 8071b49c5d..7713284c96 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java @@ -4,7 +4,6 @@ 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 36ad199159..6ffb908c43 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 5dde8a59a9..a21ec94384 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutAllEffect.java @@ -3,7 +3,6 @@ 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 273926eea4..79dce240e2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java @@ -6,7 +6,6 @@ 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 7029f63d83..24922cae10 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java @@ -1,12 +1,11 @@ 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 970191cd80..b0d619a381 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectImpl; @@ -14,6 +12,8 @@ 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 0054e030e1..15a999d6f5 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 dc808c5c39..a544a6fa82 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 5ca47ed077..7038040e8f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java @@ -1,12 +1,11 @@ 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 20fd386f88..18045f84aa 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 37bec67231..7aa79be735 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java @@ -1,9 +1,5 @@ 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; @@ -19,6 +15,10 @@ 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 cd60f7498f..8f1455f2ab 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java @@ -1,11 +1,6 @@ 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; @@ -19,6 +14,11 @@ 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 1febe3a7fa..9cd5fa8702 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java @@ -2,7 +2,6 @@ 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 f14b3e3773..8e259eba9e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java @@ -3,7 +3,6 @@ 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 2d6a475fba..9bd10c4645 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.abilities.Ability; -import mage.abilities.effects.ReplacementEffectImpl; import mage.constants.Duration; import mage.constants.Outcome; +import mage.abilities.Ability; +import mage.abilities.effects.ReplacementEffectImpl; 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 763e5fb53e..8d1fc9ba7a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java @@ -2,7 +2,6 @@ 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 1bdc6a328b..957872623b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java @@ -3,10 +3,9 @@ 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 6cfcc1bcc8..17e9449b64 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java @@ -2,7 +2,6 @@ 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 475ed61272..757dd1dc95 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java @@ -3,11 +3,10 @@ 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 b0ec223b71..af77e9b1c3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java @@ -2,9 +2,7 @@ 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 2bf820b002..a33ef0f2d4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnCreaturesFromExileEffect.java @@ -1,7 +1,6 @@ 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 7ac3dee787..8cceded80f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java @@ -2,7 +2,6 @@ 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 966fa92061..7bd9d4350e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import org.apache.log4j.Logger; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -12,6 +10,7 @@ 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 58e55642d3..b86191c515 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -1,9 +1,5 @@ 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; @@ -15,6 +11,10 @@ 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 5a42ba942a..db66028de2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -15,6 +13,8 @@ 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 f73bfa24ea..b504ce2d97 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java @@ -2,7 +2,6 @@ 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 2d95d8a596..25936223dd 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -15,6 +13,8 @@ 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 bbf11b1c94..0e39a35540 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 2892bea74a..679b857829 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java @@ -3,7 +3,6 @@ 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 3eac6b5595..9d89562071 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java @@ -1,7 +1,6 @@ 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 98e65cbd75..6f932960ff 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -1,11 +1,5 @@ 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; @@ -19,6 +13,8 @@ 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 cbbff8ad39..c3e5e59e88 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealHandSourceControllerEffect.java @@ -5,6 +5,7 @@ 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 3e7ef08ab7..c77e3560f4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java @@ -1,7 +1,6 @@ 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 74d0a0f07d..dcd4a797d3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RollPlanarDieEffect.java @@ -2,7 +2,6 @@ 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 3a35c934d5..434ebc8225 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java @@ -1,10 +1,6 @@ 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; @@ -17,6 +13,10 @@ 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 d214e044b1..fc954a3a5d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java @@ -1,7 +1,6 @@ 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 68739f1f84..a020e71d75 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java @@ -1,7 +1,6 @@ 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 ddfdeb2a22..52b840747f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java @@ -3,7 +3,6 @@ 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 f29f107746..f3e764b443 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java @@ -1,9 +1,5 @@ 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; @@ -21,6 +17,10 @@ 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 136ce8dc96..4560aeeb6b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.Locale; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; @@ -15,6 +13,8 @@ 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 812603886e..c5da540297 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java @@ -2,7 +2,6 @@ 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 c01aa4975a..cb691a322a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java @@ -6,7 +6,6 @@ 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 8b15b224f8..e764cc9216 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleHandGraveyardAllEffect.java @@ -1,7 +1,6 @@ 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 14c275ea7c..bbd77b2e8d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java @@ -2,7 +2,6 @@ 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 aec92050a3..f498b90eeb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextDrawStepControllerEffect.java @@ -30,6 +30,7 @@ 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 62449eafa4..66c97e162f 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 2289dba62f..bee5b365ba 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 4389202492..421b2c2bc9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java @@ -1,7 +1,6 @@ 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 1be1f7fdef..e3aa5c5c56 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -3,7 +3,6 @@ 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 1fde321b16..e3fbd63110 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TurnFaceUpTargetEffect.java @@ -2,7 +2,6 @@ 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 0be1cedc37..61fc84a6f7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UnlessPaysDelayedEffect.java @@ -2,7 +2,6 @@ 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 83340b819b..595fed8dc6 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 4da2152e07..385ff814ec 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 acb1bf3739..ca6f69d2a1 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 a2695226fb..f1ab28e27a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java @@ -1,7 +1,6 @@ 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 c2d5ae3a54..2c7d060144 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.common; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -11,6 +9,8 @@ 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 c09311a9a3..074459a385 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java @@ -1,8 +1,5 @@ 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; @@ -16,6 +13,9 @@ 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 0dd40ebd9a..5b3927f213 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,7 +1,6 @@ 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 06af7dc113..ec878eb5b1 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,7 +2,6 @@ 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 1c5374ba18..8d49f4525b 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,9 +1,5 @@ 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; @@ -14,6 +10,10 @@ 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 4b9fb73492..d3b865179d 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,8 +1,6 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.constants.AsThoughEffectType; @@ -13,6 +11,8 @@ 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 aa6ab1532a..40e19ce726 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,7 +2,6 @@ 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 bd25718203..f21719649a 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,7 +2,6 @@ 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 dd8f997977..605da5354c 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,7 +1,5 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.AttachmentType; @@ -9,6 +7,8 @@ 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 dafad4e271..21f0fece9a 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,7 +1,5 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -10,6 +8,8 @@ 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 7531f3513a..f783c08a55 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,7 +1,5 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -10,6 +8,8 @@ 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 4c4409aa1a..b47fd8d748 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,7 +1,5 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -11,6 +9,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * @author LevelX2 */ diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java index 800f227ba5..cdd9e6b0b2 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 7a158284bb..7bc79625d7 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,7 +1,5 @@ package mage.abilities.effects.common.combat; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.RestrictionEffect; import mage.constants.Duration; @@ -10,6 +8,8 @@ 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 256cb73818..1448aacf27 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,7 +1,5 @@ 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; @@ -9,6 +7,8 @@ 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 0b80d61e9e..dc4d48bf54 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,15 +1,17 @@ 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 1599471c59..737511b0e8 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,13 +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.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 6b1be8d98c..4629f6ed64 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 5661ba9c5c..326af72f95 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 5df7ac637b..35083b04a5 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,7 +2,6 @@ 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 117f2b0955..c3a680b771 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,7 +1,5 @@ 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; @@ -11,6 +9,8 @@ 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 40379cece3..38fccf97aa 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,7 +3,6 @@ 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 3b8d2fa351..4f4fc76fe6 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,10 +1,9 @@ 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 7864b737fd..d8806469c3 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,7 +3,6 @@ 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 31e85c2342..7375856341 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,7 +2,6 @@ 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 1884ab677e..76614f818e 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,7 +2,6 @@ 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 7a3c78ab2a..d56b0e8b0e 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,7 +3,6 @@ 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 7356bce589..d15adb8048 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,7 +6,6 @@ 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 32df47b1d6..665b9783f2 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,11 +5,7 @@ package mage.abilities.effects.common.continuous; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.AttachmentType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; 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 9dc2236905..cf3e77643c 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,11 +4,7 @@ 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.constants.SubType; +import mage.constants.*; 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 35112e9078..66bfc9bf0a 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,12 +4,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 42386bb41e..a98ade7d82 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,12 +4,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 fdd13ff681..641916af88 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,15 +2,9 @@ package mage.abilities.effects.common.continuous; import java.util.Locale; - import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 7a9e8ed45d..a09b001d53 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,12 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; 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 7bd8190247..00892f24aa 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,17 +3,11 @@ 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.CardType; -import mage.constants.DependencyType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; 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 5d0f586aac..b8f0933039 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,7 +4,6 @@ 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 bbafc16860..cf8c158d7b 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,11 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.ChooseCreatureTypeEffect; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; +import mage.constants.*; 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 fbb635fa6b..693c71b5ed 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,25 +1,16 @@ 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.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.abilities.mana.*; +import mage.constants.*; 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 73cbc9277c..ebf958615d 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,24 +1,16 @@ 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 10422aede5..23de1a78d9 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,30 +1,20 @@ 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 1c37f761bd..6e448439b1 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,11 +3,7 @@ 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.constants.SubType; +import mage.constants.*; 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 b7b3699e11..f5cefeefbf 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,20 +29,21 @@ */ 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.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; 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 d0c527f4e0..6820e727ff 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,7 +30,6 @@ 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 154364d2d7..709fca771a 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,24 +1,18 @@ 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.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.*; 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 20be92042a..2a74032610 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,13 +2,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; 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 18472e938e..16b27519ee 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,13 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; 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 c88c9d20ea..43915d9ac7 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,12 +2,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; +import mage.constants.*; 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 f467b86a66..09a34e730b 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,13 +4,7 @@ import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 b0d9766d0b..07151c6fa4 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,23 +1,17 @@ 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.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.*; 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 155b1caa32..839f691d21 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,19 +5,15 @@ */ package mage.abilities.effects.common.continuous; -import java.util.UUID; - 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.constants.SubType; +import mage.constants.*; 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 ed9d7333e1..d91a9a4d3d 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,7 +6,6 @@ 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 47b2e0c07f..3471377788 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,7 +3,6 @@ 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 71ce9cbb23..97f506cbf3 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,11 +7,7 @@ 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.constants.SubType; +import mage.constants.*; 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 06183984c6..bf1261f926 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,7 +2,6 @@ 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 bd43f4f441..901fd63335 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,7 +2,6 @@ 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 b9858ab344..1e9c895a25 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.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.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.StaticValue; +import mage.abilities.effects.ContinuousEffectImpl; 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 b6a37cebd8..2220838308 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,10 +1,6 @@ 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; @@ -15,6 +11,10 @@ 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 6c45fd5344..1cfa40263a 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,8 +2,6 @@ package mage.abilities.effects.common.continuous; -import org.apache.log4j.Logger; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -15,6 +13,7 @@ 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 43572319e2..4bc2ec8b96 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 90e4e45e7f..438fce895f 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,9 +1,6 @@ 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; @@ -18,6 +15,9 @@ 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 25f9eb64e5..cad436d0eb 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,7 +2,6 @@ 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 016c090176..06d15e343a 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,7 +3,6 @@ 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 10a1cc3871..762e6539ae 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,7 +3,6 @@ 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 bfcc4d3f30..17f4fdb141 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,7 +2,6 @@ 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 37bdeae4ae..a330989828 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,7 +1,5 @@ package mage.abilities.effects.common.continuous; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.condition.CompoundCondition; @@ -11,17 +9,15 @@ import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; import mage.cards.SplitCardHalf; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.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 f553cc0f6f..bebace3682 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,7 +2,6 @@ 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 0e066bc894..399cd4c72a 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,8 +1,5 @@ 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; @@ -16,6 +13,9 @@ 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 296c5fb49f..ecdac7e667 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,7 +6,6 @@ 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 e791787537..cbb62be79a 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,10 +1,5 @@ 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; @@ -12,15 +7,16 @@ import mage.abilities.Mode; import mage.abilities.TriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.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 fbac9f10ef..1b6395382b 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,11 +2,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.AttachmentType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.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 35503aac4c..25616f7cd4 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,24 +1,20 @@ 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.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.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 b19728f99d..63cd9898d2 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 d310348215..5647423c5d 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,21 +1,17 @@ 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.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.SubLayer; +import mage.constants.*; 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 06336cb79e..66c82fdab3 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,7 +1,6 @@ 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 d42462380a..c418dadd40 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,7 +1,6 @@ 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 8f0103c884..d2e00db536 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 9e3ac76dd6..fd56dcee2b 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,7 +3,6 @@ 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 4493c22ddf..9c43b5c4c3 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,17 +2,12 @@ package mage.abilities.effects.common.continuous; -import org.apache.log4j.Logger; - import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.AttachmentType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import 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 ca71a10fd5..44f6031387 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,7 +3,6 @@ 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 51d309bb3a..f8fa800f08 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,7 +2,6 @@ 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 d63c669c13..c8547b027e 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 d6e849b8cd..e913d661ab 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,11 +3,7 @@ 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.constants.SubType; +import mage.constants.*; 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 736c841fca..edff38e966 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,19 +1,13 @@ package mage.abilities.effects.common.continuous; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 f3c7d7dea5..02405a9d04 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,12 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; 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.*; 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 71f49faea7..295d99cd80 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,7 +2,6 @@ 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 b3d0133718..2d369f0f4d 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,7 +1,5 @@ package mage.abilities.effects.common.continuous; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; import mage.cards.Card; @@ -13,6 +11,8 @@ 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 5bb43994a7..d7051b8119 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,7 +3,6 @@ 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 e156111550..e813f875fa 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,7 +1,5 @@ package mage.abilities.effects.common.continuous; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration; @@ -11,6 +9,8 @@ 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 8d7f8d972c..2d7ff33413 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,11 +4,7 @@ package mage.abilities.effects.common.continuous; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.constants.AttachmentType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; 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 baea0522a7..05da896fff 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,12 +2,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -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.constants.*; 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 be6fa6d794..edb7b8e459 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,7 +4,6 @@ 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 7fa1a49433..fd1f1310a9 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,7 +1,5 @@ package mage.abilities.effects.common.continuous; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; @@ -14,6 +12,8 @@ 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 4e9cdfd4fe..0e07140226 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,7 +3,6 @@ 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 dd057182fa..3eb33e61e4 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 94c5271453..bc2b0c8935 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,11 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.RestrictionEffect; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.SubLayer; +import mage.constants.*; 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 4695b0edfa..1574bfecaf 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,11 +3,7 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.RestrictionEffect; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.SubLayer; +import mage.constants.*; 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 057bc9e1a2..4c36466ddf 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,7 +1,5 @@ package mage.abilities.effects.common.cost; -import org.apache.log4j.Logger; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -17,6 +15,7 @@ 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 05d7ca60d5..7e6f87daf2 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,7 +1,5 @@ package mage.abilities.effects.common.cost; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.CastCommanderAbility; import mage.abilities.common.PlayLandAsCommanderAbility; @@ -12,6 +10,8 @@ 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 ad2d2ddb7b..c043b741f9 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 9db8702b9d..3c79a57825 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,7 +3,6 @@ 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 8b8077f610..1fd38caa06 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,7 +2,6 @@ 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 0da7d6447f..5118f362b9 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,7 +2,6 @@ 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 2d873d6845..8854bc4328 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,7 +1,6 @@ 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 6e1b8f63cf..b08cd93997 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,7 +2,6 @@ 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 29e5a0aaaa..208a4c0b1e 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,7 +3,6 @@ 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 8d1f27caa1..b3166e83b5 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,8 +1,5 @@ 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; @@ -19,6 +16,9 @@ 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 c8066d8cbc..eebf00a528 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.abilities.Ability; -import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.Zone; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; 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 8213f5c1a0..ba836e76ad 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 40596f4daa..469b112664 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,7 +4,6 @@ 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 f8d368ed23..39315588d4 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,7 +2,6 @@ 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 0d9c1285dd..e82e3c94de 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,10 +1,5 @@ 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; @@ -16,6 +11,11 @@ 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 923c0a7f4d..03fc51e41c 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,7 +3,6 @@ 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 5947e9dde9..59451c359b 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,8 +1,6 @@ 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; @@ -13,6 +11,8 @@ 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 1aa90e6ea0..5e2d1d1193 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,8 +1,5 @@ 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; @@ -21,6 +18,9 @@ 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 28f47763f1..91ebc6228d 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,8 +1,5 @@ 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; @@ -20,6 +17,9 @@ 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 de3578e902..d6cb2f4eb7 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,8 +1,5 @@ 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; @@ -10,6 +7,9 @@ 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 db511a7a60..cb1b992fe5 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,7 +3,6 @@ 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 034058ae6f..66b1351f34 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,7 +2,6 @@ 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 1d0395590e..b70c8bb181 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,6 +1,7 @@ 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 6e73cc8997..851e92d6d1 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,7 +2,6 @@ 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 5b1a31524b..89e30deba4 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,7 +3,6 @@ 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 adf27b1501..e02f7003b7 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,9 +5,6 @@ */ 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; @@ -24,6 +21,9 @@ 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 4744810b39..09754429ba 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 f949745435..788c3e3754 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,7 +2,6 @@ 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 0785f0a064..86bd7d7337 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,7 +2,6 @@ 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 9568123e16..1352d886ae 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,8 +1,5 @@ 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; @@ -13,6 +10,9 @@ 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 71aa400c84..021f763d2f 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,7 +7,6 @@ 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 5ba8b9b1dc..c116004e5e 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 e965bb4ac7..2a4f1f90cc 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,7 +2,6 @@ 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 1d6bb9f97e..de6e8df825 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,7 +2,6 @@ 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 950416a351..b308dcbca4 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,7 +2,6 @@ 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 c953ed8145..9a37af2e79 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,7 +6,6 @@ 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 7603fded89..f443ca65bc 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.keyword; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; @@ -20,6 +18,8 @@ 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 84fd5c7bbc..15978c837b 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java @@ -1,7 +1,5 @@ package mage.abilities.effects.keyword; -import java.util.Locale; - import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.costs.Cost; @@ -15,6 +13,8 @@ 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 7670c366c1..b31964fc2a 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ExploreSourceEffect.java @@ -1,7 +1,6 @@ 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 e01004e7f1..9b3f932c94 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java @@ -2,7 +2,6 @@ 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 3d8f2a4538..91899deb1f 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java @@ -2,7 +2,6 @@ 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 96e74ab1ac..0f644f6b6f 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfAnyColorEffect.java @@ -1,10 +1,5 @@ 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; @@ -16,6 +11,10 @@ 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 563448f709..a2627e1135 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaOfTwoDifferentColorsEffect.java @@ -7,7 +7,6 @@ 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 596141ed27..1ad18e1788 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaAnyColorAttachedControllerEffect.java @@ -1,8 +1,5 @@ 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; @@ -11,6 +8,9 @@ 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 23c73dc0ee..17e49384e3 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java @@ -1,9 +1,5 @@ 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; @@ -14,6 +10,10 @@ 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 3efa3e24e9..ccb47b68a5 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyColorEffect.java @@ -1,8 +1,5 @@ package mage.abilities.effects.mana; -import java.util.ArrayList; -import java.util.List; - import mage.Mana; import mage.abilities.Ability; import mage.choices.ChoiceColor; @@ -10,6 +7,9 @@ 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 92d1eee568..db06a36b7d 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java @@ -1,8 +1,5 @@ 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; @@ -12,6 +9,9 @@ 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 08578d891f..0f91a11a9f 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfTwoDifferentColorsEffect.java @@ -1,9 +1,6 @@ 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; @@ -11,6 +8,9 @@ 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 af54fc6f80..4a842cf0d9 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 60314cecc1..c3c0e99633 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/BasicManaEffect.java @@ -5,6 +5,7 @@ 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 a8a767af8c..2b3aad2f21 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/DoUnlessAnyPlayerPaysManaEffect.java @@ -5,9 +5,6 @@ */ package mage.abilities.effects.mana; -import java.util.List; -import java.util.UUID; - import mage.MageObject; import mage.Mana; import mage.abilities.Ability; @@ -19,6 +16,10 @@ 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 e4611eaee8..27f17b7d39 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/DynamicManaEffect.java @@ -1,9 +1,6 @@ package mage.abilities.effects.mana; -import java.util.ArrayList; -import java.util.List; - import mage.Mana; import mage.abilities.Ability; import mage.abilities.Mode; @@ -14,6 +11,9 @@ 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 bc88b9dae4..4df8b1cf59 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 b0ceb45250..1209214005 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 c185eca521..cd36e35cfa 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.Color; +import java.awt.*; 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 36e69ce6f4..848b09ac56 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 1340dccc1c..2e8feb1cee 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java @@ -1,7 +1,6 @@ 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 fffb613b69..bb9c97f3cc 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AftermathAbility.java @@ -1,18 +1,12 @@ package mage.abilities.keyword; import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; -import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.*; import mage.cards.Card; import mage.cards.SplitCardHalf; -import mage.constants.AsThoughEffectType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java b/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java index 06dfa8a3e9..313088817b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java @@ -1,9 +1,6 @@ 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; @@ -18,6 +15,9 @@ 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 3900c366a0..2292030e09 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AscendAbility.java @@ -1,11 +1,10 @@ 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 4e5e85dcb7..7da5d3a447 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java @@ -8,11 +8,7 @@ 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.AbilityType; -import mage.constants.ManaType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; 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 f2d992dfeb..f35064d7c2 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * 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 6e7e04ad0e..381f7c42a2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java @@ -1,9 +1,5 @@ package mage.abilities.keyword; -import java.util.UUID; - -import org.apache.log4j.Logger; - import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -15,12 +11,7 @@ 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.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SpellAbilityType; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; @@ -29,6 +20,9 @@ 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 25f6555fec..79b574f3c7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BandingAbility.java @@ -2,7 +2,6 @@ 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 0f75fc1a0c..517cb2413d 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 b7eb181530..1a6f8fce78 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * 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 a5f1625f44..1ab6b82d4c 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 bb9d0525a5..885301b7a5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java @@ -2,7 +2,6 @@ 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 7929d6a8ef..28817daaf5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java @@ -1,15 +1,9 @@ package mage.abilities.keyword; -import java.util.Iterator; - import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; -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.*; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ReplacementEffectImpl; @@ -22,6 +16,8 @@ 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 3dda5dd021..68138e2f0f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CanBlockSpaceflightAbility.java @@ -6,7 +6,6 @@ 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 2079ecfadc..62e64e4948 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * @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 47cc9ac298..25b8471487 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java @@ -4,7 +4,6 @@ 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 4d27d5cb35..7a0ef7dbb1 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 26837f623d..cb32349f5b 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 d38a17dd42..211fee2602 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java @@ -1,10 +1,5 @@ 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; @@ -31,6 +26,11 @@ 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 7cc9290f29..19a50c3e32 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java @@ -4,7 +4,6 @@ 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 f70c814b71..8f91103ef5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java @@ -1,10 +1,6 @@ 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; @@ -24,6 +20,10 @@ 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 2526680deb..4e6bfc14a4 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DashAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java @@ -4,7 +4,6 @@ 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 7ec279ca92..bbca80fd97 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java b/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java index 8943812ac7..57905a581d 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java index 92e8813665..2855262cdb 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.List; - import mage.Mana; import mage.abilities.Ability; import mage.abilities.SpecialAction; @@ -24,6 +22,8 @@ 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 1de72ebcd2..7275c54a94 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java @@ -2,7 +2,6 @@ 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 7c575d4c92..b87d3a4567 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java @@ -2,7 +2,6 @@ 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 91eecd9801..afdda45c0d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java @@ -1,8 +1,6 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; @@ -14,6 +12,8 @@ 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 7e36ec3653..c11ec9da55 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.Mana; import mage.abilities.SpellAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -21,6 +19,8 @@ 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 44d7832820..4c3bbec3e2 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.abilities.StaticAbility; import mage.constants.Zone; +import mage.abilities.StaticAbility; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java index 078159fcb3..6b4b95043e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java @@ -1,22 +1,18 @@ package mage.abilities.keyword; -import java.util.Iterator; - import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; -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.*; 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 4a05973d8b..69ece42509 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EscapeAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.abilities.SpellAbility; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -14,6 +12,8 @@ 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 aa004ac4aa..ab0f8004b1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java @@ -4,7 +4,6 @@ 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 5d38d780dc..61258ee24a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java @@ -3,7 +3,6 @@ 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 41f4227b64..9d0fe3f7d9 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 014679ff08..e380accd37 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FearAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -10,6 +8,8 @@ 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 7dd4e3176c..3c467bb9dc 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java @@ -2,7 +2,6 @@ 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 eb47838cc9..10168348dd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java @@ -3,7 +3,6 @@ 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 3ece9f739f..145257ae4b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java @@ -1,7 +1,6 @@ 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 9a135bb52a..3550730f0b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -12,6 +10,8 @@ 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 7ac9a1542c..5e411a5c37 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java @@ -2,7 +2,6 @@ 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 7a479c316d..748c53cf81 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java @@ -2,16 +2,23 @@ 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 0635ec5005..eed6bc6800 100644 --- a/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java @@ -2,7 +2,6 @@ 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 ee92f883b3..cd8efee4d1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java @@ -2,7 +2,6 @@ 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 0313ace3e5..a13febfc0e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java @@ -1,8 +1,6 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.abilities.Mode; import mage.abilities.SpellAbility; import mage.abilities.TriggeredAbilityImpl; @@ -13,6 +11,8 @@ 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 3be03c4794..1395823500 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java @@ -1,7 +1,6 @@ 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 6983ba24bb..39ed14932e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromBlackAbility.java @@ -1,7 +1,6 @@ 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 ef1fa7dffb..4f65271fa0 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 d1a7153270..88fd558921 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 1c372c2d2a..fb535e1c50 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HexproofFromWhiteAbility.java @@ -1,7 +1,6 @@ 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 7dc2c4ade0..12ea093ed0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java @@ -1,7 +1,6 @@ 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 9d0e912aec..73b2ce7a35 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -10,6 +8,8 @@ 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 28f3493f05..7418145817 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java @@ -6,7 +6,6 @@ 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 a34d4e5686..0200258fd1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java @@ -2,9 +2,8 @@ package mage.abilities.keyword; import java.io.ObjectStreamException; - -import mage.abilities.StaticAbility; import mage.constants.Zone; +import mage.abilities.StaticAbility; /** * 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 7f8fe538e6..dd003f9e18 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * 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 95d987a353..3d944ba133 100644 --- a/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java @@ -1,20 +1,9 @@ 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.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.*; import mage.abilities.costs.mana.ManaCostsImpl; import mage.constants.AbilityType; import mage.constants.Outcome; @@ -23,6 +12,12 @@ 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 67a3f9a440..7158bd8ce3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java @@ -3,7 +3,6 @@ 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 231f7c4b8a..d2b31e2071 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java @@ -2,7 +2,6 @@ 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 0e17d67b26..388ad91711 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java index 5a3442e048..719ad2266a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java @@ -1,7 +1,6 @@ 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 383314ec0f..2e4f406775 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java @@ -1,11 +1,7 @@ package mage.abilities.keyword; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; 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 bf46eb35a5..545062f5c7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java @@ -2,7 +2,6 @@ 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 ae4ef9a121..e6482cc92e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -2,7 +2,6 @@ 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 744fb0857f..ae1ad7f3d9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java @@ -4,15 +4,12 @@ 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.CreateTokenCopyTargetEffect; import mage.abilities.effects.common.ExileTargetEffect; +import mage.abilities.effects.common.CreateTokenCopyTargetEffect; import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.game.Game; @@ -20,6 +17,7 @@ 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 05ff524ada..7c92b2f447 100644 --- a/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java @@ -1,7 +1,6 @@ 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 0adf925a41..9dbbdb3c03 100644 --- a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java @@ -1,7 +1,6 @@ package mage.abilities.keyword; import java.util.UUID; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -9,12 +8,7 @@ import mage.abilities.StaticAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.Card; -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.constants.*; 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 9a1866e07b..936aa998e6 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PartnerAbility.java @@ -6,7 +6,6 @@ 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 90766852c2..a9f9a82ec0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java @@ -2,7 +2,6 @@ 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 d99c9df6c3..f509b2ac2b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java @@ -3,7 +3,6 @@ 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 446ee618b9..35da5caded 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java @@ -3,7 +3,6 @@ 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 2fad9abec2..31b4f9ff56 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java @@ -2,7 +2,6 @@ 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 3125a26ffb..3e3ff1ca3c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java @@ -4,7 +4,6 @@ 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 d64c769cea..ca8c01ac39 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java index 64e8ff6893..e64e119dd6 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.UUID; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -20,6 +18,8 @@ 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 9b283d4b02..9bde3078e5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java @@ -6,7 +6,6 @@ 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 049caed11b..e4dd52dc79 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java @@ -1,16 +1,10 @@ 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.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.*; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -23,6 +17,8 @@ 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 c3b4d4eaab..a83256e774 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java @@ -2,6 +2,9 @@ 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; @@ -10,9 +13,6 @@ 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 1050142cdd..ed1689c4e1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -11,6 +9,8 @@ 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 80c67818e7..fb7f24fa88 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index 34835f319d..0ccefbb914 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 java.util.UUID; - +import mage.constants.ComparisonType; 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 d59b2c6229..ed9223756e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.io.ObjectStreamException; - import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.MageSingleton; @@ -10,6 +8,8 @@ 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 f8f5424b65..531f3b6304 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpectacleAbility.java @@ -1,8 +1,5 @@ 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; @@ -12,6 +9,9 @@ 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 47b9966fd2..c6a604730c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java @@ -2,7 +2,6 @@ package mage.abilities.keyword; import java.util.Iterator; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -13,11 +12,7 @@ import mage.abilities.costs.CostsImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.SpliceCardEffectImpl; import mage.cards.Card; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SpellAbilityType; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; 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 41849ba54c..52136ebe7f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoInstantOrSorceryAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.Iterator; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -20,6 +18,8 @@ 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 91d9bb899a..55e5823ea5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import java.util.Optional; - import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -12,6 +10,8 @@ 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 373f0793d3..4648197645 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java index a490144a3c..001c1add9b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/StormAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java @@ -1,7 +1,5 @@ package mage.abilities.keyword; -import org.apache.log4j.Logger; - import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -15,6 +13,7 @@ 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 460495063e..aa03cf9579 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java @@ -3,7 +3,6 @@ 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 5f6a3533c5..4d3a17be18 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SurgeAbility.java @@ -1,8 +1,5 @@ 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; @@ -12,6 +9,9 @@ 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 4916381461..379d81027b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java @@ -3,7 +3,6 @@ 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; @@ -20,13 +19,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.cards.Card; -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.constants.*; 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 9f83effa3b..a4b14d88a5 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java @@ -2,7 +2,6 @@ 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 47b4f03df4..fb90104d2d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -5,14 +5,7 @@ import mage.abilities.Mode; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; -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.constants.*; 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 d335ef472a..7a4c9770b2 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 86762259b3..9af00077c3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java @@ -2,7 +2,6 @@ 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 c08dfffa09..f5d4e4e8ea 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java b/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java index 7eee8ca746..45ca481063 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * 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 62f821665b..5ed22bd1c5 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 java.io.ObjectStreamException; - +import mage.constants.Zone; import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; -import mage.constants.Zone; + +import java.io.ObjectStreamException; /** * diff --git a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java index c6acdbd9b4..5185139165 100644 --- a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java @@ -3,7 +3,6 @@ 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 e659d29b79..9b35256389 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java @@ -1,8 +1,5 @@ package mage.abilities.mana; -import java.util.ArrayList; -import java.util.List; - import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -19,6 +16,9 @@ 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 d32ea77f5b..84ac4f9a8b 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java @@ -5,9 +5,6 @@ */ package mage.abilities.mana; -import java.util.ArrayList; -import java.util.List; - import mage.Mana; import mage.ObjectColor; import mage.abilities.Ability; @@ -23,6 +20,9 @@ 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 d4064ac1f9..7392ba4fad 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 d19217ff93..17c75f4b05 100644 --- a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java @@ -1,9 +1,5 @@ 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; @@ -18,6 +14,10 @@ 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 18ff0c7d9d..c8d9cf3ac4 100644 --- a/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java @@ -2,7 +2,6 @@ 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 15a44889f2..c2d0a97511 100644 --- a/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java @@ -2,7 +2,6 @@ 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 024aec8744..a6b77494d4 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 e93f331ef7..087a1d23c6 100644 --- a/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java @@ -3,7 +3,6 @@ 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 2bea2f14b4..d4d0de12ff 100644 --- a/Mage/src/main/java/mage/abilities/mana/ManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ManaAbility.java @@ -6,7 +6,6 @@ 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 422436f906..bfd32e4747 100644 --- a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java +++ b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java @@ -4,9 +4,6 @@ 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; @@ -14,6 +11,7 @@ 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 24a84ae127..0877a667c2 100644 --- a/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java @@ -2,7 +2,6 @@ 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 846382bc17..41173683bd 100644 --- a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java @@ -2,7 +2,6 @@ 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 f4300ed901..62b2fbf003 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,7 +1,5 @@ package mage.abilities.mana.builder.common; -import java.util.UUID; - import mage.ConditionalMana; import mage.MageObject; import mage.Mana; @@ -13,6 +11,8 @@ 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 68c64957ea..86e7b3bbe4 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,7 +1,5 @@ package mage.abilities.mana.builder.common; -import java.util.UUID; - import mage.ConditionalMana; import mage.Mana; import mage.abilities.Ability; @@ -12,6 +10,8 @@ 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 03a2169697..c13f3033d0 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java @@ -2,7 +2,6 @@ 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 95a7b5d731..86f5939b30 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java @@ -6,7 +6,6 @@ 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 bb9e36eabb..a6a822bd9d 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java @@ -2,7 +2,6 @@ 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 9ce703fb9c..86823bf289 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java @@ -2,7 +2,6 @@ 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 b27475bffa..25509560e5 100644 --- a/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java +++ b/Mage/src/main/java/mage/abilities/mana/conditional/PlaneswalkerCastManaCondition.java @@ -1,8 +1,6 @@ package mage.abilities.mana.conditional; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.SpellAbility; @@ -10,6 +8,8 @@ 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 569f90955d..0a4a17cb4c 100644 --- a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java @@ -3,7 +3,6 @@ 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 cac250fa47..87431fd1d6 100644 --- a/Mage/src/main/java/mage/abilities/text/TextPart.java +++ b/Mage/src/main/java/mage/abilities/text/TextPart.java @@ -3,7 +3,6 @@ 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 7efacc7379..dba094ec98 100644 --- a/Mage/src/main/java/mage/actions/MageDrawAction.java +++ b/Mage/src/main/java/mage/actions/MageDrawAction.java @@ -3,7 +3,6 @@ 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 a20eb1d69b..ebd9a6de56 100644 --- a/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java +++ b/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java @@ -1,9 +1,8 @@ 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 e510d5aa6d..1cb62d410a 100644 --- a/Mage/src/main/java/mage/cards/AdventureCard.java +++ b/Mage/src/main/java/mage/cards/AdventureCard.java @@ -2,7 +2,6 @@ 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 d802996896..82c157401c 100644 --- a/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java +++ b/Mage/src/main/java/mage/cards/AdventureCardSpellImpl.java @@ -5,11 +5,6 @@ */ 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; @@ -20,6 +15,11 @@ 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 6bec200f98..81a6877abb 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -2,7 +2,6 @@ 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 11352ae540..d0c4ae0641 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 java.io.Serializable; - import mage.ObjectColor; +import java.io.Serializable; + 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 2b7209fc03..8ebe60c3d7 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -1,45 +1,26 @@ 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.Abilities; -import mage.abilities.AbilitiesImpl; -import mage.abilities.Ability; -import mage.abilities.PlayLandAbility; -import mage.abilities.SpellAbility; +import mage.abilities.*; import mage.abilities.hint.Hint; import mage.abilities.hint.HintUtils; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.repository.PluginClassloaderRegistery; -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.constants.*; import mage.counters.Counter; import mage.counters.Counters; import mage.filter.FilterMana; -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.*; import mage.game.command.CommandObject; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -49,6 +30,7 @@ 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 9105e78860..447175b38a 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 2f94058c7d..4ffe0c228f 100644 --- a/Mage/src/main/java/mage/cards/Cards.java +++ b/Mage/src/main/java/mage/cards/Cards.java @@ -6,7 +6,6 @@ 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 b9c0565ce0..250bb3f3b8 100644 --- a/Mage/src/main/java/mage/cards/CardsImpl.java +++ b/Mage/src/main/java/mage/cards/CardsImpl.java @@ -1,25 +1,15 @@ 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 0ff40eafa9..f187953993 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -1,18 +1,8 @@ package mage.cards; import java.io.Serializable; -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.*; import java.util.stream.Collectors; - -import org.apache.log4j.Logger; - import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.keyword.PartnerWithAbility; @@ -23,6 +13,7 @@ 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 f8d874d640..2c3912f2f6 100644 --- a/Mage/src/main/java/mage/cards/LevelerCard.java +++ b/Mage/src/main/java/mage/cards/LevelerCard.java @@ -3,7 +3,6 @@ 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 d5616e2e3b..af29691a26 100644 --- a/Mage/src/main/java/mage/cards/MeldCard.java +++ b/Mage/src/main/java/mage/cards/MeldCard.java @@ -1,9 +1,6 @@ package mage.cards; -import java.util.List; -import java.util.UUID; - import mage.abilities.Ability; import mage.constants.CardType; import mage.constants.Zone; @@ -12,6 +9,9 @@ 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 e007d05e7a..1c3bde2f14 100644 --- a/Mage/src/main/java/mage/cards/Sets.java +++ b/Mage/src/main/java/mage/cards/Sets.java @@ -1,14 +1,5 @@ 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; @@ -19,6 +10,10 @@ 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 a75ba798f0..21c58c6c13 100644 --- a/Mage/src/main/java/mage/cards/SplitCard.java +++ b/Mage/src/main/java/mage/cards/SplitCard.java @@ -3,7 +3,6 @@ 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 4afb473d47..4649864452 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 82c662a011..768c366f03 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.abilities.mana.ActivatedManaAbilityImpl; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.abilities.mana.ActivatedManaAbilityImpl; +import mage.cards.CardImpl; 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 cec4c64cbc..2092d60e98 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Forest.java +++ b/Mage/src/main/java/mage/cards/basiclands/Forest.java @@ -3,7 +3,6 @@ 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 284a584d13..063123bc02 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Island.java +++ b/Mage/src/main/java/mage/cards/basiclands/Island.java @@ -3,7 +3,6 @@ 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 82e2507047..5db835d232 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Mountain.java +++ b/Mage/src/main/java/mage/cards/basiclands/Mountain.java @@ -3,7 +3,6 @@ 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 58f7b17695..cef5b07cc4 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Plains.java +++ b/Mage/src/main/java/mage/cards/basiclands/Plains.java @@ -3,7 +3,6 @@ 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 cf7a1713a8..9ea15701f8 100644 --- a/Mage/src/main/java/mage/cards/basiclands/Swamp.java +++ b/Mage/src/main/java/mage/cards/basiclands/Swamp.java @@ -3,7 +3,6 @@ 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 feb76c46ef..8718c63540 100644 --- a/Mage/src/main/java/mage/cards/decks/Constructed.java +++ b/Mage/src/main/java/mage/cards/decks/Constructed.java @@ -1,18 +1,13 @@ 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 f1e1a3c40f..8ffb88bcc0 100644 --- a/Mage/src/main/java/mage/cards/decks/Deck.java +++ b/Mage/src/main/java/mage/cards/decks/Deck.java @@ -7,14 +7,12 @@ 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 a2823e6bca..d7ca6415ed 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java +++ b/Mage/src/main/java/mage/cards/decks/DeckFileFilter.java @@ -1,10 +1,9 @@ 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 d869d55d6e..1677fe79bd 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckFormats.java +++ b/Mage/src/main/java/mage/cards/decks/DeckFormats.java @@ -1,21 +1,16 @@ 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 dedf261678..2b0e71e502 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 java.util.HashMap; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + /** * @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 dff458b7dd..506fd6310b 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 48624b503c..b65ec5925b 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 272b6b86e9..5865df3894 100644 --- a/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java +++ b/Mage/src/main/java/mage/cards/decks/DnDDeckTargetListener.java @@ -1,5 +1,8 @@ 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; @@ -11,10 +14,6 @@ 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 221faf8cae..d9a4b8ab40 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java @@ -1,15 +1,14 @@ 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 4ce800dfde..68073ae2cc 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporter.java @@ -1,20 +1,14 @@ 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 2c6a7b0312..af7666a45d 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgArenaDeckExporterTest.java @@ -1,14 +1,13 @@ package mage.cards.decks.exporter; -import static org.junit.Assert.assertEquals; +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; +import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.junit.Test; - -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.assertEquals; /** * @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 2495ddec93..5cf545b911 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/MtgOnlineDeckExporter.java @@ -1,17 +1,16 @@ 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 458cf16df6..c3e18fe023 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java @@ -1,18 +1,17 @@ package mage.cards.decks.exporter; -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 javax.swing.filechooser.FileFilter; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + 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 8e4b644939..09d3278925 100644 --- a/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java +++ b/Mage/src/main/java/mage/cards/decks/exporter/XmageInfoDeckExporter.java @@ -1,17 +1,16 @@ package mage.cards.decks.exporter; -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 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 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 308a35207c..f7d874f041 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 35346fe82a..5ab07af1de 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java @@ -6,6 +6,7 @@ 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 dab58f685d..dd153c5abe 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java @@ -1,12 +1,15 @@ 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 5ec84422f6..5914165f1c 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 86e2e28893..7c23d28c60 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java @@ -7,6 +7,7 @@ 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 53c9e27d26..4949690873 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/MtgaImporter.java @@ -1,6 +1,11 @@ package mage.cards.decks.importer; -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.CardCriteria; +import mage.cards.repository.CardInfo; import java.util.Collections; import java.util.List; @@ -9,12 +14,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.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; +import static mage.cards.decks.CardNameUtil.CARD_NAME_PATTERN; 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 c8794a7af6..831b09f364 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 2bfb608b7f..8598688a8d 100644 --- a/Mage/src/main/java/mage/cards/mock/MockCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockCard.java @@ -1,9 +1,5 @@ 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; @@ -12,6 +8,9 @@ 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 3f31fb161d..7858ba1e65 100644 --- a/Mage/src/main/java/mage/cards/mock/MockSplitCard.java +++ b/Mage/src/main/java/mage/cards/mock/MockSplitCard.java @@ -1,7 +1,5 @@ package mage.cards.mock; -import java.util.List; - import mage.MageInt; import mage.abilities.Ability; import mage.cards.CardSetInfo; @@ -12,6 +10,8 @@ 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 c4324640fc..85882512b2 100644 --- a/Mage/src/main/java/mage/cards/repository/CardCriteria.java +++ b/Mage/src/main/java/mage/cards/repository/CardCriteria.java @@ -1,15 +1,13 @@ package mage.cards.repository; -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 java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; 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 a480cb8c63..10e2e4cd3c 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -1,38 +1,22 @@ 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.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.*; import mage.cards.mock.MockCard; import mage.cards.mock.MockSplitCard; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.SpellAbilityType; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; 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 93a15eda77..d77c31bd1a 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -1,17 +1,5 @@ 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; @@ -22,12 +10,16 @@ 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 e9d8b6ac84..6660c6da84 100644 --- a/Mage/src/main/java/mage/cards/repository/CardScanner.java +++ b/Mage/src/main/java/mage/cards/repository/CardScanner.java @@ -1,18 +1,12 @@ 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 e1aaa304db..8b17210ea5 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java @@ -1,14 +1,13 @@ 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 3a7f174aae..6370e4cbfc 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java @@ -1,14 +1,5 @@ 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; @@ -17,8 +8,15 @@ 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; /** * @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 3668cb9da2..2056f74719 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 a22f8159e3..33dda83d60 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 063ac5888c..07086fa0f4 100644 --- a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java +++ b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java @@ -1,10 +1,5 @@ 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; @@ -12,8 +7,11 @@ 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; /** * @author North, JayDi85 diff --git a/Mage/src/main/java/mage/choices/ChoiceColor.java b/Mage/src/main/java/mage/choices/ChoiceColor.java index 43f6b0c6b8..9e7109654f 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 aaff7acb3b..c17b5ac9e4 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 java.util.LinkedHashSet; -import java.util.stream.Collectors; - import mage.MageObject; import mage.constants.SubType; +import java.util.LinkedHashSet; +import java.util.stream.Collectors; + 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 4446880ac1..66ea9d37c1 100644 --- a/Mage/src/main/java/mage/choices/ChoiceImpl.java +++ b/Mage/src/main/java/mage/choices/ChoiceImpl.java @@ -1,14 +1,10 @@ package mage.choices; -import java.io.Serializable; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import mage.util.RandomUtil; +import java.io.Serializable; +import java.util.*; + /** * @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 c09e7a2ff6..12cca314a6 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 java.util.stream.Collectors; - import mage.constants.SubType; +import java.util.stream.Collectors; + /** * @author tre3qwerty */ diff --git a/Mage/src/main/java/mage/choices/Choices.java b/Mage/src/main/java/mage/choices/Choices.java index 272f77b3ed..9bb5c0910d 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 26029fbd48..6ab7e4891d 100644 --- a/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java +++ b/Mage/src/main/java/mage/choices/ChooseFriendsAndFoes.java @@ -8,7 +8,6 @@ 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 b7471f9213..821db4a1ba 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 1537424563..2fb4ea0410 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 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; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.Set; +import java.util.stream.Collectors; + 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 ca149a4215..ffe2b05a62 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -1,7 +1,5 @@ package mage.constants; -import java.util.UUID; - import mage.cards.Card; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -11,6 +9,8 @@ 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 cecf9f5a0b..1844fa5d3f 100644 --- a/Mage/src/main/java/mage/counters/Counter.java +++ b/Mage/src/main/java/mage/counters/Counter.java @@ -2,7 +2,6 @@ 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 131fc53853..3554e68c50 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -1,10 +1,5 @@ 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; @@ -24,6 +19,11 @@ 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 3759a8d1e3..3f839a0f64 100644 --- a/Mage/src/main/java/mage/filter/Filter.java +++ b/Mage/src/main/java/mage/filter/Filter.java @@ -3,7 +3,6 @@ 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 f02a6602a1..b9c3e18fa6 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -5,14 +5,9 @@ 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.ObjectPlayer; -import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.ObjectSourcePlayer; -import mage.filter.predicate.Predicate; -import mage.filter.predicate.Predicates; +import mage.filter.predicate.*; 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 887a99b8e6..b30a61f4f4 100644 --- a/Mage/src/main/java/mage/filter/FilterImpl.java +++ b/Mage/src/main/java/mage/filter/FilterImpl.java @@ -2,7 +2,6 @@ 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 cf948d1d84..db4b65b2c6 100644 --- a/Mage/src/main/java/mage/filter/FilterInPlay.java +++ b/Mage/src/main/java/mage/filter/FilterInPlay.java @@ -3,7 +3,6 @@ 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 2b912353da..63ec4379e3 100644 --- a/Mage/src/main/java/mage/filter/FilterPermanent.java +++ b/Mage/src/main/java/mage/filter/FilterPermanent.java @@ -1,10 +1,5 @@ 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; @@ -13,6 +8,11 @@ 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 c58f2baa7e..85e26cff85 100644 --- a/Mage/src/main/java/mage/filter/FilterPlayer.java +++ b/Mage/src/main/java/mage/filter/FilterPlayer.java @@ -1,9 +1,5 @@ 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; @@ -11,6 +7,10 @@ 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 6334c1243d..377ea63b0b 100644 --- a/Mage/src/main/java/mage/filter/FilterSpell.java +++ b/Mage/src/main/java/mage/filter/FilterSpell.java @@ -2,7 +2,6 @@ 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 0626cba1e3..789c2d3267 100644 --- a/Mage/src/main/java/mage/filter/FilterStackObject.java +++ b/Mage/src/main/java/mage/filter/FilterStackObject.java @@ -1,9 +1,5 @@ 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; @@ -12,6 +8,10 @@ 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 d764f3a23f..7e71f5e9cf 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -9,28 +9,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; -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.common.*; 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 12c06c35e4..1e8b0d139d 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java @@ -2,7 +2,6 @@ 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 8c32436f20..4657174caa 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 60bc2d3ff2..d44c37311c 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java @@ -2,7 +2,6 @@ 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 34b45ae64a..195bc29124 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java @@ -3,6 +3,7 @@ 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 cd4f642f6f..f52643b37f 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java @@ -2,7 +2,6 @@ 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 e298a83c0a..16c0eb3623 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 70630370d2..601bb952bc 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java @@ -4,7 +4,6 @@ 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 a27dd8692e..e4e64de396 100644 --- a/Mage/src/main/java/mage/filter/predicate/Predicate.java +++ b/Mage/src/main/java/mage/filter/predicate/Predicate.java @@ -2,7 +2,6 @@ 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 79b75bdba4..6e6796c711 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 3106dec025..ee93a32a90 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java @@ -2,7 +2,6 @@ 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 c98425b270..e04342dd97 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java @@ -2,7 +2,6 @@ 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 ea7babf388..ab282fc21a 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 4f9f06a8ee..0acf3d1faa 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java @@ -3,7 +3,6 @@ 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 cd5f4cad89..e5c060ea0d 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 d42c44e126..a261bf58fc 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorPredicate.java @@ -8,6 +8,8 @@ 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 ef492472a4..7759d5d3b2 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java @@ -2,6 +2,7 @@ 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 b17e1ea500..6d4b211bcf 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToLKIPermanentId.java @@ -3,7 +3,6 @@ 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 bb4e679dfc..54d3c490ed 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java @@ -1,7 +1,6 @@ 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 6eedd25e91..a52633c2b5 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java @@ -2,7 +2,6 @@ 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 11fa038691..d87cb515c7 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java @@ -2,7 +2,6 @@ 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 b120a95d21..dc284f6200 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java @@ -1,8 +1,5 @@ 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; @@ -12,6 +9,9 @@ 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 020763b370..15c2a46491 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java @@ -2,7 +2,6 @@ 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 113daba5a7..46b073d965 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java +++ b/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java @@ -2,7 +2,6 @@ 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 83fb9ee0d0..105fb306db 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java @@ -2,7 +2,6 @@ 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 c174a04b6c..08433ae089 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsOnlyOnePlayerPredicate.java @@ -6,7 +6,6 @@ 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 f820f51259..6cf6f6e71b 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java @@ -2,7 +2,6 @@ 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 2496260810..af8f556bc4 100644 --- a/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/other/TargetsPlayerPredicate.java @@ -6,7 +6,6 @@ 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 7de0936bb5..9f287b3a93 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java @@ -2,7 +2,6 @@ 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 a78afc7272..112dbc3b9a 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 1d082e530d..135281a0e1 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java @@ -1,7 +1,6 @@ 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 665be6c0eb..18649a706b 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java @@ -2,7 +2,6 @@ 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 74889ba891..3fa0071a2d 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 f4d646a185..1f0b700974 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java @@ -5,6 +5,8 @@ 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 681b06c736..3fb4305a6b 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java @@ -1,7 +1,5 @@ package mage.filter.predicate.permanent; -import java.util.UUID; - import mage.constants.TargetController; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; @@ -9,6 +7,8 @@ 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 1ba5a185bc..71491195df 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 ebaf1e62fa..c92c414594 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 53ef2642ad..c387ee3bcf 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java @@ -2,7 +2,6 @@ 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 1a7171484d..5a03ec6d6d 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java @@ -2,7 +2,6 @@ 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 09adf8d86e..e0f9945ec5 100644 --- a/Mage/src/main/java/mage/game/CardAttribute.java +++ b/Mage/src/main/java/mage/game/CardAttribute.java @@ -6,7 +6,6 @@ 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 84778afa21..7ce8d79f5c 100644 --- a/Mage/src/main/java/mage/game/CardState.java +++ b/Mage/src/main/java/mage/game/CardState.java @@ -3,7 +3,6 @@ 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 dca5c58970..a8a4474e40 100644 --- a/Mage/src/main/java/mage/game/Exile.java +++ b/Mage/src/main/java/mage/game/Exile.java @@ -1,19 +1,14 @@ 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 510f822b16..451d2bb249 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 java.util.UUID; - import mage.cards.CardsImpl; +import java.util.UUID; + /** * @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 daa8665457..a38e1f8c11 100644 --- a/Mage/src/main/java/mage/game/Game.java +++ b/Mage/src/main/java/mage/game/Game.java @@ -1,16 +1,8 @@ package mage.game; import java.io.Serializable; -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.*; import java.util.stream.Collectors; - import mage.MageItem; import mage.MageObject; import mage.abilities.Ability; @@ -26,12 +18,7 @@ import mage.cards.Cards; import mage.cards.MeldCard; import mage.cards.decks.Deck; import mage.choices.Choice; -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.constants.*; 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 b810fea179..ab7408114a 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 5719828952..6731f4f39f 100644 --- a/Mage/src/main/java/mage/game/GameCommanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java @@ -2,7 +2,6 @@ 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 f97e8df34c..2fc07a9ac7 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1,34 +1,8 @@ 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.Ability; -import mage.abilities.ActivatedAbility; -import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.OpeningHandAction; -import mage.abilities.SpellAbility; -import mage.abilities.TriggeredAbility; +import mage.abilities.*; import mage.abilities.common.AttachableToRestrictedAbility; import mage.abilities.common.CantHaveMoreThanAmountCountersSourceAbility; import mage.abilities.common.SagaAbility; @@ -43,28 +17,10 @@ import mage.abilities.keyword.TransformAbility; import mage.abilities.mana.DelayedTriggeredManaAbility; import mage.abilities.mana.TriggeredManaAbility; import mage.actions.impl.MageAction; -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.*; import mage.cards.decks.Deck; import mage.choices.Choice; -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.constants.*; import mage.counters.CounterType; import mage.counters.Counters; import mage.designations.Designation; @@ -81,15 +37,8 @@ import mage.game.command.CommandObject; import mage.game.command.Commander; import mage.game.command.Emblem; import mage.game.command.Plane; -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.*; 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; @@ -112,17 +61,13 @@ import mage.util.GameLog; import mage.util.MessageToClient; import mage.util.RandomUtil; import mage.util.functions.ApplyToPermanent; -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; +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; 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 14cdf71340..81bf98babf 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 66988a3f0a..5f61dc0dc1 100644 --- a/Mage/src/main/java/mage/game/GameState.java +++ b/Mage/src/main/java/mage/game/GameState.java @@ -1,33 +1,7 @@ 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.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.*; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffects; import mage.abilities.effects.Effect; @@ -60,6 +34,10 @@ 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 aea1ea1904..a803a10aea 100644 --- a/Mage/src/main/java/mage/game/GameStates.java +++ b/Mage/src/main/java/mage/game/GameStates.java @@ -4,7 +4,6 @@ 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 31a7414b3a..0a64d1b381 100644 --- a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java +++ b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java @@ -1,9 +1,5 @@ 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; @@ -15,19 +11,17 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.MultiplayerAttackOption; -import mage.constants.PhaseStep; -import mage.constants.RangeOfInfluence; -import mage.constants.Rarity; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; 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 cb75fa8e4c..2e068eb102 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 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; +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/game/Revealed.java b/Mage/src/main/java/mage/game/Revealed.java index 59eb59ea0c..0ec4349f5d 100644 --- a/Mage/src/main/java/mage/game/Revealed.java +++ b/Mage/src/main/java/mage/game/Revealed.java @@ -6,7 +6,6 @@ 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 f8a1b69f28..95dfeba2f8 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 e8fba037ca..eba4df35c6 100644 --- a/Mage/src/main/java/mage/game/Table.java +++ b/Mage/src/main/java/mage/game/Table.java @@ -2,12 +2,7 @@ package mage.game; import java.io.Serializable; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; - +import java.util.*; 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 1fa348ce15..6129d73e41 100644 --- a/Mage/src/main/java/mage/game/Team.java +++ b/Mage/src/main/java/mage/game/Team.java @@ -3,7 +3,6 @@ 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 e732714e39..fa5ab51777 100644 --- a/Mage/src/main/java/mage/game/ZoneChangeInfo.java +++ b/Mage/src/main/java/mage/game/ZoneChangeInfo.java @@ -3,7 +3,6 @@ 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 9ab40d4d70..d7bac4124b 100644 --- a/Mage/src/main/java/mage/game/ZonesHandler.java +++ b/Mage/src/main/java/mage/game/ZonesHandler.java @@ -1,14 +1,5 @@ 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; @@ -27,6 +18,8 @@ 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 1bc0399c59..7f429cda99 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -1,17 +1,5 @@ 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; @@ -43,6 +31,10 @@ 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 0d25e5c01c..be2f139af6 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -2,12 +2,7 @@ package mage.game.combat; import java.io.Serializable; -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.*; 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 1bc4950aa0..2a376c6b3f 100644 --- a/Mage/src/main/java/mage/game/command/CommandObject.java +++ b/Mage/src/main/java/mage/game/command/CommandObject.java @@ -2,7 +2,6 @@ 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 2da67ee195..e8a34c3a7d 100644 --- a/Mage/src/main/java/mage/game/command/Commander.java +++ b/Mage/src/main/java/mage/game/command/Commander.java @@ -1,17 +1,9 @@ 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.Abilities; -import mage.abilities.AbilitiesImpl; -import mage.abilities.Ability; -import mage.abilities.PlayLandAbility; -import mage.abilities.SpellAbility; +import mage.abilities.*; import mage.abilities.common.CastCommanderAbility; import mage.abilities.common.PlayLandAsCommanderAbility; import mage.abilities.costs.mana.ManaCost; @@ -28,6 +20,10 @@ 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 69aa617562..7a4a8896aa 100644 --- a/Mage/src/main/java/mage/game/command/Emblem.java +++ b/Mage/src/main/java/mage/game/command/Emblem.java @@ -1,9 +1,5 @@ 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; @@ -26,6 +22,10 @@ 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 13038f420d..d06d5b355b 100644 --- a/Mage/src/main/java/mage/game/command/Plane.java +++ b/Mage/src/main/java/mage/game/command/Plane.java @@ -1,10 +1,5 @@ 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; @@ -29,6 +24,11 @@ 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 78eba03d95..25f7674a4e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java @@ -4,7 +4,6 @@ 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 700e10975a..fbb1cee20d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java @@ -1,7 +1,5 @@ package mage.game.command.emblems; -import java.util.List; - import mage.abilities.Ability; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.Effect; @@ -15,6 +13,8 @@ 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 eb81bc5ce0..0de0f51a96 100644 --- a/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java @@ -6,7 +6,6 @@ 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 c09c03af7a..ad4ecfda6d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -7,13 +7,8 @@ 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.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.constants.*; + 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 15ddd39959..32a2fb8daf 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java @@ -1,14 +1,19 @@ 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.constants.Duration; -import mage.constants.TurnPhase; -import mage.constants.Zone; +import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; +import mage.abilities.effects.common.PreventAllDamageToPlayersEffect; +import mage.constants.*; 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 4bcde08909..a0c9ae8905 100644 --- a/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java @@ -1,7 +1,5 @@ package mage.game.command.emblems; -import java.util.List; - import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; @@ -23,6 +21,8 @@ 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 5e4f674e30..4131d1b323 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ObNixilisOfTheBlackOathEmblem.java @@ -1,8 +1,6 @@ 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; @@ -13,6 +11,7 @@ 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 1e31fa30f8..f730fc2d4b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java @@ -1,8 +1,6 @@ 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; @@ -12,6 +10,7 @@ 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 0a4cfd0a90..cda33d8faa 100644 --- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java @@ -1,22 +1,18 @@ 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.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.command.Emblem; import mage.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 2aed3102bd..e8b54b8e29 100644 --- a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java @@ -3,7 +3,6 @@ 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 a1f3d679a2..e879dd6054 100644 --- a/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AgyremPlane.java @@ -1,9 +1,5 @@ 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; @@ -33,6 +29,10 @@ 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 d2b94c2533..3582cc9482 100644 --- a/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AkoumPlane.java @@ -3,7 +3,6 @@ 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 193d3f77cd..15260c05f5 100644 --- a/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AstralArenaPlane.java @@ -1,9 +1,5 @@ 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; @@ -24,6 +20,10 @@ 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 f44e26630f..5ea0fc27e6 100644 --- a/Mage/src/main/java/mage/game/command/planes/BantPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/BantPlane.java @@ -4,7 +4,6 @@ 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 24872fec61..4a29f9fd16 100644 --- a/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java @@ -5,15 +5,16 @@ 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 8a67a6f6b0..04fb098a1f 100644 --- a/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java @@ -3,7 +3,6 @@ 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 6ed51a03ed..f8444d6fc8 100644 --- a/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java @@ -3,7 +3,6 @@ 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 ef59f02d85..06cb2d410e 100644 --- a/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/HedronFieldsOfAgadeemPlane.java @@ -1,8 +1,5 @@ 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; @@ -25,6 +22,9 @@ 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 4130aafd5c..ca7299dc14 100644 --- a/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/LetheLakePlane.java @@ -3,7 +3,6 @@ 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 b51bca4381..335eba469a 100644 --- a/Mage/src/main/java/mage/game/command/planes/NayaPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/NayaPlane.java @@ -3,7 +3,6 @@ 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 11c7f29583..3f2123ecfb 100644 --- a/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java @@ -2,7 +2,6 @@ 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 7daba37b08..e1accd02cb 100644 --- a/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TazeemPlane.java @@ -1,8 +1,5 @@ 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; @@ -25,6 +22,9 @@ 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 f09e426b5d..1ca83d8f7b 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java @@ -3,7 +3,6 @@ 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 02c82b82ab..75592637a0 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheEonFogPlane.java @@ -3,7 +3,6 @@ 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 903d3a9be5..329a91b5e8 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheGreatForestPlane.java @@ -3,7 +3,6 @@ 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; @@ -14,6 +13,7 @@ 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 167945654a..74fd5f5edc 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheZephyrMazePlane.java @@ -3,7 +3,6 @@ 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 ba3cb316fe..fe00e2898d 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java @@ -5,7 +5,6 @@ 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 d54d48062a..24ca5e3f43 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrugaJunglePlane.java @@ -3,7 +3,6 @@ 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 cb9b193a84..16b5665f2d 100644 --- a/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TurriIslandPlane.java @@ -3,7 +3,6 @@ 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 fb7610f3a2..1bb70f17f6 100644 --- a/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java @@ -3,7 +3,6 @@ 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 f06b0f77de..480d96b183 100644 --- a/Mage/src/main/java/mage/game/draft/BoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/BoosterDraft.java @@ -3,7 +3,6 @@ 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 42f060d31a..8fef779f78 100644 --- a/Mage/src/main/java/mage/game/draft/Draft.java +++ b/Mage/src/main/java/mage/game/draft/Draft.java @@ -7,7 +7,6 @@ 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 2df081abaa..7854940ccb 100644 --- a/Mage/src/main/java/mage/game/draft/DraftCube.java +++ b/Mage/src/main/java/mage/game/draft/DraftCube.java @@ -4,13 +4,11 @@ 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 0e015a56e6..5ef5a2330e 100644 --- a/Mage/src/main/java/mage/game/draft/DraftImpl.java +++ b/Mage/src/main/java/mage/game/draft/DraftImpl.java @@ -1,24 +1,12 @@ package mage.game.draft; -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 java.util.*; import mage.cards.Card; import mage.cards.ExpansionSet; import mage.game.draft.DraftOptions.TimingOption; -import mage.game.events.Listener; -import mage.game.events.PlayerQueryEvent; -import mage.game.events.PlayerQueryEventSource; -import mage.game.events.TableEvent; +import mage.game.events.*; 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 c052ef882b..88cafa94df 100644 --- a/Mage/src/main/java/mage/game/draft/DraftOptions.java +++ b/Mage/src/main/java/mage/game/draft/DraftOptions.java @@ -3,7 +3,6 @@ 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 72721da25c..0c7c49ca5f 100644 --- a/Mage/src/main/java/mage/game/draft/DraftPlayer.java +++ b/Mage/src/main/java/mage/game/draft/DraftPlayer.java @@ -6,7 +6,6 @@ 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 04d53ef66d..3463363470 100644 --- a/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java @@ -3,10 +3,9 @@ package mage.game.draft; import java.util.ArrayList; -import java.util.Collections; import java.util.List; - import mage.cards.ExpansionSet; +import java.util.Collections; /** * diff --git a/Mage/src/main/java/mage/game/draft/RateCard.java b/Mage/src/main/java/mage/game/draft/RateCard.java index 14e734bdcd..d2d3608a85 100644 --- a/Mage/src/main/java/mage/game/draft/RateCard.java +++ b/Mage/src/main/java/mage/game/draft/RateCard.java @@ -1,26 +1,9 @@ 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.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.*; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.Card; @@ -31,6 +14,10 @@ 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 ec8154bb32..da3fd7d8da 100644 --- a/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RichManBoosterDraft.java @@ -4,11 +4,9 @@ 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 0d74b28f99..082d82deb5 100644 --- a/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java @@ -1,11 +1,7 @@ package mage.game.draft; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; +import java.util.*; 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 c3a45f8e0f..b7dad08225 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 java.util.UUID; - import mage.util.CardUtil; +import java.util.UUID; + /** * @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 38eba9e58d..75dee4fad2 100644 --- a/Mage/src/main/java/mage/game/events/CostEvent.java +++ b/Mage/src/main/java/mage/game/events/CostEvent.java @@ -2,7 +2,6 @@ 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 2b8851c0d5..3d7599a231 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 a02a73af33..3dc799ad4e 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 java.util.UUID; - import mage.util.CardUtil; +import java.util.UUID; + /** * @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 65623d2860..fb854bcdf1 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 55eb73b4c3..debf475c45 100644 --- a/Mage/src/main/java/mage/game/events/ManaEvent.java +++ b/Mage/src/main/java/mage/game/events/ManaEvent.java @@ -3,7 +3,6 @@ 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 6bb68e9b1f..508ce78bf0 100644 --- a/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java +++ b/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java @@ -9,7 +9,6 @@ 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 35159d93cd..87dd6f45ec 100644 --- a/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java +++ b/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java @@ -5,7 +5,6 @@ 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 d9bde63a38..1d4cbefd63 100644 --- a/Mage/src/main/java/mage/game/events/TableEvent.java +++ b/Mage/src/main/java/mage/game/events/TableEvent.java @@ -5,7 +5,6 @@ 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 bfc9fe6c6b..6c37e9badd 100644 --- a/Mage/src/main/java/mage/game/events/TableEventSource.java +++ b/Mage/src/main/java/mage/game/events/TableEventSource.java @@ -2,18 +2,18 @@ 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.MultiplayerRound; import mage.game.tournament.TournamentPairing; +import java.io.Serializable; +import java.util.UUID; +import mage.game.tournament.MultiplayerRound; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java index d33170ee3f..9068532141 100644 --- a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java +++ b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java @@ -2,7 +2,6 @@ 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 b3345b8463..213f3a39d9 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 672f9820ac..0ab9150dd3 100644 --- a/Mage/src/main/java/mage/game/match/Match.java +++ b/Mage/src/main/java/mage/game/match/Match.java @@ -4,7 +4,6 @@ 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 6a1ca4ecf8..668ef67670 100644 --- a/Mage/src/main/java/mage/game/match/MatchImpl.java +++ b/Mage/src/main/java/mage/game/match/MatchImpl.java @@ -1,13 +1,5 @@ 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; @@ -21,6 +13,9 @@ 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 fc1a7c4436..0fd193193e 100644 --- a/Mage/src/main/java/mage/game/match/MatchOptions.java +++ b/Mage/src/main/java/mage/game/match/MatchOptions.java @@ -1,12 +1,6 @@ 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; @@ -15,6 +9,12 @@ 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 166f34f6ab..e7b876ceb6 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 3e640fcd48..320f39897c 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 cdc897f7d3..aec6f4bc28 100644 --- a/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java @@ -1,9 +1,5 @@ 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; @@ -13,6 +9,10 @@ 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 05e07fae2b..43abf6c284 100644 --- a/Mage/src/main/java/mage/game/mulligan/Mulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/Mulligan.java @@ -1,15 +1,11 @@ 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 7f10ed7b0a..89ed63c087 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 621f43c827..9a131224d9 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 0a0e1f62f5..6aacd3e45f 100644 --- a/Mage/src/main/java/mage/game/permanent/Battlefield.java +++ b/Mage/src/main/java/mage/game/permanent/Battlefield.java @@ -1,15 +1,9 @@ package mage.game.permanent; import java.io.Serializable; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; 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 140372233c..6102332e9e 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -1,9 +1,5 @@ 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; @@ -14,6 +10,10 @@ 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 52a2ccc5a8..bb387139e6 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -1,7 +1,5 @@ package mage.game.permanent; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -13,6 +11,8 @@ 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 bf6db4b4a3..7c20cb36c8 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1,19 +1,5 @@ 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; @@ -26,33 +12,11 @@ import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.RestrictionEffect; import mage.abilities.hint.Hint; import mage.abilities.hint.HintUtils; -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.keyword.*; import mage.abilities.text.TextPart; import mage.cards.Card; import mage.cards.CardImpl; -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.constants.*; import mage.counters.Counter; import mage.counters.CounterType; import mage.counters.Counters; @@ -62,17 +26,10 @@ import mage.game.ZoneChangeInfo; import mage.game.ZonesHandler; import mage.game.combat.CombatGroup; import mage.game.command.CommandObject; -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.*; 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; @@ -80,6 +37,10 @@ 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 5479e4bac6..6b2728d140 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentMeld.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentMeld.java @@ -2,7 +2,6 @@ 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 215ebef25f..ba809c2056 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -1,7 +1,5 @@ package mage.game.permanent; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; @@ -9,6 +7,8 @@ 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 47dace338f..f2d7c93246 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.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.CardType; import mage.constants.SubType; +import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.effects.common.CreateTokenEffect; /** * 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 9671f284d7..d8273083ec 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 51692d704f..a403149e9f 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 899d6c0591..d992ba44f4 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 660c58c63f..6715ee73f1 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 e7b294d304..960758bc3d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -3,7 +3,6 @@ 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 9d6841da4a..e6f0fc6fd9 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 b2a44d7602..8dd5d9ee1d 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 1d7b4d9b03..b611c88065 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 c33d0364d0..fdb347b0cd 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 c349167ca8..5678ce5f7f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java @@ -1,10 +1,5 @@ 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; @@ -17,6 +12,11 @@ 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 e234a46aa8..5775db91f2 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 34612b34ac..9376200c6d 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 36b9e33f4e..cff99af782 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 dcd035f865..157e31ef2f 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 ed6188c1f1..4f78ccd9af 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 3cfaccdc0c..6e22ffb8ce 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -3,7 +3,6 @@ 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 9fffe8054d..7e7c7999dc 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 07fe444d6b..50727e81da 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - 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/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index 7c83177b6b..f59cbc94a6 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; 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/BeastToken4.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java index 94db59e354..d6b579b451 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java @@ -5,6 +5,10 @@ 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 51d8104762..10da78ae2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -4,7 +4,6 @@ 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 5752cab1a0..61a0954317 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -1,9 +1,5 @@ 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; @@ -21,6 +17,10 @@ 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 be1d0ea60e..6bb98201c1 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 10a115d403..6360df3ff7 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 82a04ec978..c73f04867b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -3,7 +3,6 @@ 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 8a053f4442..ecf7bb3cfa 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 1388d95f6e..0467ccce64 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 b9da57366e..688c606238 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 bf59176a76..191101098a 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 a5ac603340..7b07047126 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 0c11ff6d55..5378a9fc14 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 983247ee3a..4ad88b0f3c 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 ba1641e74c..98e01857ff 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 a5025d233d..bfc82b3969 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -5,7 +5,6 @@ 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 2d3a2ecd6c..63b4f4c6dd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -4,9 +4,8 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - -import mage.abilities.keyword.ForestwalkAbility; import mage.constants.CardType; +import mage.abilities.keyword.ForestwalkAbility; 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 4e2369a18d..2af5a0e77f 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 a369b39145..ad35700571 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -4,10 +4,9 @@ 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 a24337ceab..f537c443bd 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.MageInt; -import mage.abilities.keyword.IslandwalkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.IslandwalkAbility; /** * 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 b4ebe6b1e7..ecf5ef1b3b 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 c1196fd295..c9948238f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -1,10 +1,6 @@ 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; @@ -15,6 +11,10 @@ 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 d84403a0a6..a927019756 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 abdeff4e1e..204d6717dd 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.MageInt; -import mage.abilities.keyword.IslandwalkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.IslandwalkAbility; /** * 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 d3d36a440b..9480897c73 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 81c951c777..b28fbe3944 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 c6727f31e1..084cfebc5c 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 e83cebd672..5b12d51c57 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 2598b2b7a7..a5314fa346 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.MageInt; -import mage.abilities.keyword.ChangelingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.ChangelingAbility; /** * 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 6e9e18b4cd..7e0359e674 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 00dd64b6d9..373a82d8eb 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 20dfdf8335..ca72b9bfa0 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 0e005352de..b9ae698a31 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 528ca70f6d..bb64e98d08 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.MageInt; -import mage.abilities.keyword.ShroudAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.ShroudAbility; /** * 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 fd5ef25ff9..ffd6cb6759 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -1,6 +1,8 @@ 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; @@ -8,8 +10,6 @@ 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 4d73426760..edbd8a3076 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -4,10 +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.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 d76993efd9..8d3c7883fe 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.MageInt; -import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; /** * 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 88a02e0762..9f494ab5cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -3,7 +3,6 @@ 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 1471b3cd17..c285dd8e8c 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 68b5826ef3..775459ce18 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 940ed6f228..44bfc7e8aa 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 88431ef2cc..5b4e48babb 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 06b9d158ee..34776c6ec0 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 de193fc529..1fdaffe7b7 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 f14f6997fc..73534848d8 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 0018bf9a7f..859a8e2be2 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.Duration; import mage.constants.SubType; +import mage.constants.Duration; 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 8d7e1a67c0..babf74f8df 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 2e1291d250..d6444d782d 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 7b8af98bc2..13d468195d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -5,7 +5,6 @@ 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 95043d879d..e603a6178f 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 df1ba5cbe5..51799e349a 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 51b7f1185a..467f16a0b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -4,10 +4,9 @@ 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 f6b043ed10..da9a93e57f 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.MageInt; -import mage.abilities.keyword.AnnihilatorAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.AnnihilatorAbility; /** * 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 b9d8910bc5..95f042f15b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -4,7 +4,6 @@ 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 9ea3f3d6f0..c70ad88684 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 ab9b4fc69d..13a993952c 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 3ca27b7ea2..88637b7b67 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -4,7 +4,6 @@ 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 990403509e..5369b5bff6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java @@ -5,7 +5,6 @@ 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 cf5941c260..686a443bcc 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 8193a0b670..71ae36fa8b 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - 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/ElfToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java index 8b2b311ee9..baad518b72 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java @@ -4,7 +4,6 @@ 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 df3b684982..ff472627b3 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 7958b36748..1f608901ce 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 a1aa9313ec..76ea60a009 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 b834ae851d..a5b324e663 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 9e8a3b632a..fa5a9797d5 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 dfb053ce95..b826239e56 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 97aa99639b..a4d6f1da0a 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 4ac9a55b18..9cc5e12305 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java @@ -1,9 +1,5 @@ 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; @@ -15,6 +11,10 @@ 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 3cfb7404f4..a49e7343db 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 5541a7c79e..2f2c3b25ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java @@ -4,12 +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.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 0ca1b134c3..1dd66a20ae 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 8b60b62fbc..29e4b21c93 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 1aa559f68f..5d1f182654 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.MageInt; -import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; /** * 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 8b511c8470..7b8ed218af 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GermToken.java @@ -4,7 +4,6 @@ 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 00c6bafb9e..395e126aaa 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 ad6fa12941..f33b82b956 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 d9a52cd835..03da6d7486 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 e18d9b521f..b3461e2edf 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 894ed75691..5f286483af 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; 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/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java index 40453abb42..1936a72788 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java @@ -3,10 +3,9 @@ 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 070f93fddb..5ac834a92e 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.MageInt; -import mage.abilities.keyword.MountainwalkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.MountainwalkAbility; /** * 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 fded4c7d09..8682237b61 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 fdcd702d99..da279757c1 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 268ea791c7..94b1e50c95 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 be7aab51aa..2a1a0007f2 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 9c9eb6e556..04764f2c58 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 88a3f057d6..9f82f171dc 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 684decd820..14dcc4203e 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 fb23c60fc1..8acd4b6412 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; 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/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index 97e2f6a330..5d59a2248e 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 8915c4ea0f..51ffa57bbd 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + 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 a8e569b50c..424cf239d9 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 3eb5e3a852..626f4a2674 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 a017125535..a6997c2f4b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -2,16 +2,15 @@ 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 4e9f5d2e65..3420af70a8 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 2bd272d882..b03ced80b0 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 146a235384..f22622473f 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 d69eafaff5..83aff50e61 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 5f390f0e50..b3b3344c72 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 953866fc85..91fea8b5ef 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 f8c75126ad..b66c85ae3a 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 40a7ee2532..a20c160fc1 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 292a1f85ab..c4b6806385 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 e6eb92f24e..e57bcd4fc1 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 b01e9ae857..79f039152e 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 2072c561c3..63fbd6c793 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -4,12 +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.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 551e6d5da8..f0751efe80 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -3,7 +3,6 @@ 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 b0f275c413..5dace1e254 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 66edd4c6b0..0a1aa382d2 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 e1f96e4f90..e69fa6de41 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 3a73cd76f9..7992ed3736 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.MageInt; -import mage.abilities.keyword.InfectAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.InfectAbility; /** * 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 e1875d7fa8..8b2fa6e4bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -5,7 +5,6 @@ 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 7a3d29a764..2395dc2ebc 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.MageInt; -import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.LifelinkAbility; /** * 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 fcdc8f13aa..6b7f5a3e1b 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 47457591b5..d4dd3a6c8a 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 9ad5a3c2af..36321493ef 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 6b7d992b59..3b420527c6 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 ba4b22a8e4..1f7c8b9857 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 a2608ecbf1..de4d9be1e2 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 5db676e934..842cc6d7da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -1,9 +1,5 @@ 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; @@ -15,6 +11,10 @@ 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 fb554088bd..cb6a989684 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -4,7 +4,6 @@ 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 e2ef065be1..7dfa0862a8 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 01f0941ea3..9a247da94e 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 0af2ec4a1e..e4e02e23bc 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 94d67d1aab..f07a27b4d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java @@ -1,7 +1,6 @@ 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 4aed2eb194..70e6ae380f 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 36031f9a09..35f63cd23b 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 3cda9ebaac..b3378c9949 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java @@ -3,10 +3,9 @@ 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 a05109fb97..99135f4710 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 dfcaac78a1..69cc8040ab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -4,11 +4,10 @@ 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 mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 faa80ed814..aa2c7d53bb 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 5b5fa2dbd6..d9397da598 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 7545eb88d1..47773e5e40 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 75b584d21b..ed4dff01d6 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.MageInt; -import mage.abilities.mana.GreenManaAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.mana.GreenManaAbility; /** * 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 24a6b4847c..200f68b756 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 058bd76d77..7a4dc7adaf 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 8e37d0e4b2..67cbafef84 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java @@ -1,7 +1,5 @@ package mage.game.permanent.token; -import java.util.Arrays; - import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; @@ -9,6 +7,8 @@ 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 6e31471efe..533b800056 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 035e80488d..c8837d51dc 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 6291d534e1..f066130b9b 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 a92627fdb0..37a366a5e7 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 2859d043c9..79513b0de1 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 ee11e4e090..88592990f9 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 6e60c66407..9a35537d5e 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.MageInt; -import mage.abilities.keyword.ProwessAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.ProwessAbility; /** * 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 89bb3ac231..a1914b0c90 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + 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 fb09b6bb53..20523f5204 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 3f47d49962..e479adff3c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java @@ -1,6 +1,8 @@ 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; @@ -10,10 +12,8 @@ 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 e4281eed89..02c764c2ed 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 5c39d64c21..800fc02f5d 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 f238d3d0f8..bd0082403b 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 d018c77923..0b7ea29d4e 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 065820fc88..87767529a5 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 c6d081d3a9..5eb1c790a2 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 04c4775a8d..e2cfd72053 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 f1ac305fdf..42736bec1e 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 d993fa0deb..a3b3f57836 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.MageInt; -import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; /** * 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 9608967022..383605fd5c 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 8fff45fd4f..027eb9edec 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 c8c53fa2e5..f554901c28 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 71f364f07c..332b0d1cbe 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 a1100b1e34..2d24d3e34b 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 e85182f950..7a73e23765 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 7ce4ae2b02..b6efaf716a 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 4a99b4803f..80340d7db2 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.MageInt; -import mage.abilities.keyword.ReachAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.ReachAbility; /** * 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 ecff13cb4f..e42e1834df 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.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; /** * 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 f823fec48a..2aca577dda 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 3a8c278b7f..4b775da214 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 8eec1206da..9d1bf07eb6 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 658382bbd0..8fe8ebf6a2 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 7b8004f485..545bc43402 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 aba1a420d0..962b0c657a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -5,7 +5,6 @@ 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 000c2bed83..377fbc706a 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 bc1179be78..fc09a8c7a5 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 23fb5240f1..8f0336ee67 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -4,7 +4,6 @@ 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 9dc8f071fb..aa84af908c 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 4f3ac141dc..bc4861d688 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 7b3993fb72..1afa17bd77 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 8077bf2606..e3912f9f2b 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 dd5c1424e8..51ebd774da 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 690e3f3b15..bbc2c3efb6 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 787c2ada14..9cf4c9b9fc 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; 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/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index c37cc3ada2..b138576764 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 b1144e9ffd..6c72f06f39 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.MageInt; -import mage.ObjectColor; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.ObjectColor; /** * 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 285e54f46f..1ac90fc567 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 943420460f..8b13e13b18 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 c40e2aba99..634a8a8b59 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 f10591caf1..f77b399704 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 ea9782188a..3b268d15ca 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 4aec4d8fa3..a669ea004f 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 a344ea342f..4fc671fca7 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 93882049c9..c413d20bca 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 5bbeeea3b9..3c08fd7f26 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 9c30d642b6..85a13db68a 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 119a2e3c91..bef552a52e 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 03af667494..59b2e3cb2d 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 586eb2d4d7..ab70e8e24a 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 7b36c9c999..c2e699b2f6 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 69778926a6..dfe2f6c89c 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 398a29a990..4bd1546730 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 2b116bee1e..d26a118b30 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 137f4b298d..e0416e121c 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 e678530d37..828a2545d8 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 63ecf6bd44..201ea26aee 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 1bfd47b823..fd049a066a 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 1e17465b52..3af7624285 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -2,7 +2,8 @@ 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; @@ -11,9 +12,7 @@ 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 1a5d1ecb75..a4f9e5967d 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 fb9c11d0a3..43fc61957d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -4,7 +4,6 @@ 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 aa8efb4dbc..7f5d05ce52 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 d10f65bb29..4f267bdf72 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.ColoredManaSymbol; import mage.constants.SubType; +import mage.constants.ColoredManaSymbol; 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 2296420218..743fe20171 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 98c475084e..a35648a22c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java @@ -3,10 +3,9 @@ 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 8a790a63bb..868a8f5e2f 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 8707c1dcf0..2b7069db4e 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - 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/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 6c23464248..6275b24333 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 4c7b210e53..59fe7b1231 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -5,11 +5,10 @@ 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 mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 574347bf68..9e81cc4e87 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.MageInt; -import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.LifelinkAbility; /** * 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 43a3357d69..bde1506ce5 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 3eccb60bbd..77c4b6aa63 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 8162686bca..29b6b565e2 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 e2199b1d88..5ad16fb45f 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.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; /** * 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 25a348a701..f81e52f44b 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 bf23b5100e..6c5dd0e72f 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 af271353e4..3c9a24cefc 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 1414da6445..6cd7374deb 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 4f2dd97752..7f64cfe920 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * @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 f118027834..bfcf62c011 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 4d4e997164..bc5bfdcbca 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.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; +import mage.MageInt; +import mage.abilities.keyword.CumulativeUpkeepAbility; +import mage.abilities.keyword.FlyingAbility; /** * 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 2a768ca5d8..e49b5949ad 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 31d9af6cbc..da3cb49d28 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 1ce50dc9fc..f3db928d7a 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import mage.MageInt; 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/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java index 5ee8d1779d..e0c941c1b4 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 0bae620e38..bff1d69f12 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 245403ac57..fa83cda6df 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 836010bf89..bad943aa92 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.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; /** * 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 4145cd4331..115777d638 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 0211bb6964..e5624079b5 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 1371200be5..a2c8fe91a4 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 6330d666b4..73077e7588 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 ea8eead860..35221bece3 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 3971c23d57..8fb2edb795 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 abfce20337..596d9d8695 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -5,11 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; 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 5f5256d638..439d6ba897 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 3c9fb6c3df..d2a6c00ffd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -4,7 +4,6 @@ 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 93ccff3a47..f422785dc9 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 539d46990a..a417cea721 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -5,7 +5,6 @@ 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 cc58979ae3..39d242a8ce 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 91370d3e24..70bfd582cb 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 5ea953638c..38bd95ccd7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -4,11 +4,10 @@ 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.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.ObjectColor; /** * 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 5f7affc517..95a4a88ce8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -1,13 +1,12 @@ 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 24ada6653e..222b063c81 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -1,10 +1,5 @@ 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; @@ -19,6 +14,11 @@ 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 2427b1ed48..069ba44f0e 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 e9a97ad9a1..dd23d59eda 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -1,9 +1,5 @@ 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; @@ -13,6 +9,10 @@ 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 5f2404234c..33a14db3c5 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 263bae2e19..d8f28e061b 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 c5ff24a755..b4dc4df3c1 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 3e721aa0ad..8fb6538aaf 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 80b20af116..22979f03c5 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; 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 6c86d4e951..98bedc8bf6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -4,11 +4,10 @@ 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 mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 5b9fdc0974..9b10f6d21d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java @@ -4,12 +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.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 758d878d49..c0acb79c8f 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 d2ff9a8a08..dd9bb168cf 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.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; /** * 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 49baed4acd..5de31bfe82 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 4b686985a9..77dffa3e24 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 a69e7bcb70..b07977696f 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 57daa485da..d1fdcf21fe 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 d9147c4492..77dc8c07af 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -4,11 +4,10 @@ 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 mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 9cd8a5e8d8..e4580a6e0f 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 4baef06c26..67c49089b8 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 d2b2134ed8..fcec46692a 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 c71a18a7ee..4b7e87aaf4 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 fff4f8fc69..52edc3276e 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 1ecf50e386..0bc2872f8b 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.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; /** * 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 8899538651..907ea24ad0 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.abilities.keyword.FlyingAbility; import mage.constants.CardType; +import mage.abilities.keyword.FlyingAbility; 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 ebd4aae93a..95eb587e00 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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - 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/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index f59fc4a7d2..25858e1b72 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.MageInt; -import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; /** * 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 c00d0c3290..af156cd597 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.MageInt; -import mage.abilities.keyword.BandsWithOtherAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.BandsWithOtherAbility; /** * 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 8a0bba091c..21f493d197 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.MageInt; -import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DefenderAbility; /** * 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 1734f9ca4b..f1d333c761 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 5245974c03..b59b644580 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 488f17ec75..85d0116826 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.MageInt; -import mage.abilities.keyword.DeathtouchAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.DeathtouchAbility; /** * 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 a8c58fea48..7b313746d8 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.MageInt; -import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.LifelinkAbility; /** * 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 0e8dd137c2..598e85a5a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java @@ -5,11 +5,10 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - -import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.TrampleAbility; /** * 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 9ea8f44c36..31425bb2bd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java @@ -5,10 +5,9 @@ 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 1e7c2e74ef..a988c885da 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.MageInt; -import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.MageInt; +import mage.abilities.keyword.HasteAbility; /** * 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 a6034dbb5c..a17aa4a007 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 bce656d4e6..4927f61524 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 105f734cbf..0518703268 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 8cfa2d8257..d4d701f5d7 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 f2f3b56613..46d3414cb0 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,6 +5,7 @@ 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 a18d2c8784..3c29624c2e 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -1,11 +1,6 @@ package mage.game.stack; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; - +import java.util.*; import mage.MageInt; import mage.MageObject; import mage.Mana; @@ -21,20 +16,8 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.keyword.BestowAbility; import mage.abilities.keyword.MorphAbility; import mage.abilities.text.TextPart; -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.cards.*; +import mage.constants.*; 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 bd84af0249..40b5c96388 100644 --- a/Mage/src/main/java/mage/game/stack/SpellStack.java +++ b/Mage/src/main/java/mage/game/stack/SpellStack.java @@ -4,14 +4,12 @@ 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 4a9ecaa31b..bd37c6436f 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -1,20 +1,9 @@ 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.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.*; import mage.abilities.costs.Cost; import mage.abilities.costs.CostAdjuster; import mage.abilities.costs.Costs; @@ -28,15 +17,7 @@ import mage.abilities.hint.Hint; import mage.abilities.text.TextPart; import mage.cards.Card; import mage.cards.FrameStyle; -import mage.constants.AbilityType; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.EffectType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; -import mage.constants.ZoneDetail; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -49,6 +30,11 @@ 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 3168eed4b1..6b38b76acb 100644 --- a/Mage/src/main/java/mage/game/stack/StackObjImpl.java +++ b/Mage/src/main/java/mage/game/stack/StackObjImpl.java @@ -1,8 +1,5 @@ package mage.game.stack; -import java.util.Set; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -17,6 +14,9 @@ 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 08e166992d..9a51ed2d4d 100644 --- a/Mage/src/main/java/mage/game/stack/StackObject.java +++ b/Mage/src/main/java/mage/game/stack/StackObject.java @@ -2,7 +2,6 @@ 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 848d7185f2..0151beed80 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 bacd81c5ec..6c9ba9f0b7 100644 --- a/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java +++ b/Mage/src/main/java/mage/game/tournament/MultiplayerRound.java @@ -5,7 +5,6 @@ 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 688459d446..a296709b79 100644 --- a/Mage/src/main/java/mage/game/tournament/Tournament.java +++ b/Mage/src/main/java/mage/game/tournament/Tournament.java @@ -5,7 +5,6 @@ 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 9c3e28ec59..3d1bfe73ed 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java @@ -1,30 +1,15 @@ package mage.game.tournament; -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.*; 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.Listener; -import mage.game.events.PlayerQueryEvent; -import mage.game.events.PlayerQueryEventSource; -import mage.game.events.TableEvent; +import mage.game.events.*; 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; @@ -35,6 +20,7 @@ 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 50136a5285..c81294ce3e 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 a891007e1b..3939ce40f0 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentPairing.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentPairing.java @@ -3,7 +3,6 @@ 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 236109935c..18b063822b 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java @@ -1,7 +1,5 @@ package mage.game.tournament; -import java.util.Set; - import mage.cards.decks.Deck; import mage.constants.TournamentPlayerState; import mage.game.result.ResultProtos.TourneyPlayerProto; @@ -10,6 +8,8 @@ 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 e03b63a4a9..8d366a2136 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java @@ -4,7 +4,6 @@ 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 68c5e7264a..714305a73a 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.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 96663bb7cb..f326717453 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 java.util.ArrayList; -import java.util.List; - import mage.game.tournament.TournamentPairing; import mage.game.tournament.TournamentPlayer; +import java.util.ArrayList; +import java.util.List; + /** * * @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 9129616f35..4be6d8f9ff 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java @@ -2,17 +2,12 @@ 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 96a921ea64..1b4572364b 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 5edc98660a..17f5a0edda 100644 --- a/Mage/src/main/java/mage/game/turn/BeginCombatStep.java +++ b/Mage/src/main/java/mage/game/turn/BeginCombatStep.java @@ -3,7 +3,6 @@ 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 b46efcb5ec..b4cd6a7a4d 100644 --- a/Mage/src/main/java/mage/game/turn/BeginningPhase.java +++ b/Mage/src/main/java/mage/game/turn/BeginningPhase.java @@ -3,7 +3,6 @@ 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 e504a3a8de..efe7e7596c 100644 --- a/Mage/src/main/java/mage/game/turn/CleanupStep.java +++ b/Mage/src/main/java/mage/game/turn/CleanupStep.java @@ -3,7 +3,6 @@ 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 8c1105c2d3..823c6a2aa0 100644 --- a/Mage/src/main/java/mage/game/turn/CombatDamageStep.java +++ b/Mage/src/main/java/mage/game/turn/CombatDamageStep.java @@ -2,7 +2,6 @@ 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 3372255eb9..f4d7d6ccf5 100644 --- a/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java +++ b/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java @@ -3,7 +3,6 @@ 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 1be18c6bc2..774b264dde 100644 --- a/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java +++ b/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java @@ -2,7 +2,6 @@ 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 2e60b46b69..1e721d416b 100644 --- a/Mage/src/main/java/mage/game/turn/DrawStep.java +++ b/Mage/src/main/java/mage/game/turn/DrawStep.java @@ -3,7 +3,6 @@ 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 80d9d9e8bc..d7a6b9bec9 100644 --- a/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java +++ b/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java @@ -3,7 +3,6 @@ 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 7c7f1221fa..ccab10fe2a 100644 --- a/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java +++ b/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java @@ -2,7 +2,6 @@ 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 5a561db45f..2cf15e94e7 100644 --- a/Mage/src/main/java/mage/game/turn/Phase.java +++ b/Mage/src/main/java/mage/game/turn/Phase.java @@ -6,7 +6,6 @@ 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 6fa6a7bb9d..9806e61d9d 100644 --- a/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java +++ b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java @@ -2,7 +2,6 @@ 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 828ac68b66..c7633190e5 100644 --- a/Mage/src/main/java/mage/game/turn/Step.java +++ b/Mage/src/main/java/mage/game/turn/Step.java @@ -3,7 +3,6 @@ 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 70337a84e9..359f254256 100644 --- a/Mage/src/main/java/mage/game/turn/Turn.java +++ b/Mage/src/main/java/mage/game/turn/Turn.java @@ -1,11 +1,5 @@ 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; @@ -18,6 +12,12 @@ 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 29adcdf8de..f5246ae6ea 100644 --- a/Mage/src/main/java/mage/game/turn/TurnMod.java +++ b/Mage/src/main/java/mage/game/turn/TurnMod.java @@ -4,7 +4,6 @@ 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 8a20ae929f..a1ab81b7cd 100644 --- a/Mage/src/main/java/mage/game/turn/TurnMods.java +++ b/Mage/src/main/java/mage/game/turn/TurnMods.java @@ -4,7 +4,6 @@ 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 34858fc4a9..d9c0c28f38 100644 --- a/Mage/src/main/java/mage/game/turn/UntapStep.java +++ b/Mage/src/main/java/mage/game/turn/UntapStep.java @@ -3,7 +3,6 @@ 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 cb0fd5e6a5..82323073e8 100644 --- a/Mage/src/main/java/mage/players/Library.java +++ b/Mage/src/main/java/mage/players/Library.java @@ -1,28 +1,15 @@ 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 d8206ba5e7..2c5df2da27 100644 --- a/Mage/src/main/java/mage/players/ManaPool.java +++ b/Mage/src/main/java/mage/players/ManaPool.java @@ -1,13 +1,5 @@ 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; @@ -23,6 +15,9 @@ 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 426e607f61..34db510c20 100644 --- a/Mage/src/main/java/mage/players/ManaPoolItem.java +++ b/Mage/src/main/java/mage/players/ManaPoolItem.java @@ -3,7 +3,6 @@ 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 c5c9504650..b81a841ec6 100644 --- a/Mage/src/main/java/mage/players/Player.java +++ b/Mage/src/main/java/mage/players/Player.java @@ -1,23 +1,9 @@ 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.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.*; import mage.abilities.costs.AlternativeSourceCosts; import mage.abilities.costs.Cost; import mage.abilities.costs.Costs; @@ -29,13 +15,7 @@ import mage.cards.Card; import mage.cards.Cards; import mage.cards.decks.Deck; import mage.choices.Choice; -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.constants.*; import mage.counters.Counter; import mage.counters.Counters; import mage.designations.Designation; @@ -58,6 +38,9 @@ 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 89a06ddf1f..942826f2bb 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1,89 +1,31 @@ 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.Abilities; -import mage.abilities.AbilitiesImpl; -import mage.abilities.Ability; -import mage.abilities.ActivatedAbility; +import mage.abilities.*; 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.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.*; 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.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.keyword.*; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.mana.ManaOptions; import mage.actions.MageDrawAction; -import mage.cards.AdventureCard; -import mage.cards.Card; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.cards.SplitCard; +import mage.cards.*; import mage.cards.decks.Deck; import mage.choices.ChoiceImpl; -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.constants.*; import mage.counters.Counter; import mage.counters.CounterType; import mage.counters.Counters; @@ -97,20 +39,11 @@ import mage.filter.common.FilterCreatureForCombat; import mage.filter.common.FilterCreatureForCombatBlock; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; -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.*; import mage.game.combat.CombatGroup; import mage.game.command.CommandObject; -import mage.game.events.DamagePlayerEvent; -import mage.game.events.DamagedPlayerEvent; -import mage.game.events.FlipCoinEvent; -import mage.game.events.GameEvent; +import mage.game.events.*; 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; @@ -130,6 +63,11 @@ 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 8eae489b1d..f25b5a9a16 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 9bf0174991..6891338002 100644 --- a/Mage/src/main/java/mage/players/StubPlayer.java +++ b/Mage/src/main/java/mage/players/StubPlayer.java @@ -1,13 +1,5 @@ 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; @@ -21,7 +13,6 @@ 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; @@ -33,6 +24,15 @@ 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 20e1623234..c29e4965cf 100644 --- a/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java +++ b/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java @@ -2,7 +2,6 @@ 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 9dd8cc8eac..06f2aff922 100644 --- a/Mage/src/main/java/mage/players/net/UserData.java +++ b/Mage/src/main/java/mage/players/net/UserData.java @@ -1,11 +1,7 @@ package mage.players.net; import java.io.Serializable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; /** * 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 100248a2d0..a9b7d45ec0 100644 --- a/Mage/src/main/java/mage/target/Target.java +++ b/Mage/src/main/java/mage/target/Target.java @@ -1,10 +1,5 @@ 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; @@ -12,6 +7,11 @@ 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 70cdd5e7a8..41da56d5ea 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 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; +import java.util.ArrayList; +import java.util.List; +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/TargetCard.java b/Mage/src/main/java/mage/target/TargetCard.java index 6b89b9b5f0..464b14ff22 100644 --- a/Mage/src/main/java/mage/target/TargetCard.java +++ b/Mage/src/main/java/mage/target/TargetCard.java @@ -1,10 +1,5 @@ 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; @@ -15,6 +10,11 @@ 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 a0005ccbc9..438bbb35ad 100644 --- a/Mage/src/main/java/mage/target/TargetImpl.java +++ b/Mage/src/main/java/mage/target/TargetImpl.java @@ -1,14 +1,5 @@ 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; @@ -21,6 +12,8 @@ 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 7c1dfc1c50..575ad44873 100644 --- a/Mage/src/main/java/mage/target/TargetObject.java +++ b/Mage/src/main/java/mage/target/TargetObject.java @@ -1,7 +1,6 @@ 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 5badd35a8b..65a8e26e33 100644 --- a/Mage/src/main/java/mage/target/TargetPermanent.java +++ b/Mage/src/main/java/mage/target/TargetPermanent.java @@ -1,9 +1,5 @@ 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; @@ -12,6 +8,10 @@ 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 6f334e0ef4..7b2d0bdf77 100644 --- a/Mage/src/main/java/mage/target/TargetPlayer.java +++ b/Mage/src/main/java/mage/target/TargetPlayer.java @@ -3,7 +3,6 @@ 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 2a1f098552..e0dae36e50 100644 --- a/Mage/src/main/java/mage/target/TargetSource.java +++ b/Mage/src/main/java/mage/target/TargetSource.java @@ -5,7 +5,6 @@ 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 a559d90d6a..0fe66adb0a 100644 --- a/Mage/src/main/java/mage/target/TargetSpell.java +++ b/Mage/src/main/java/mage/target/TargetSpell.java @@ -1,11 +1,6 @@ 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; @@ -14,6 +9,11 @@ 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 5145c80771..eeccdc2df7 100644 --- a/Mage/src/main/java/mage/target/TargetStackObject.java +++ b/Mage/src/main/java/mage/target/TargetStackObject.java @@ -1,9 +1,5 @@ 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; @@ -11,6 +7,10 @@ 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 41f844377c..0409700fe4 100644 --- a/Mage/src/main/java/mage/target/Targets.java +++ b/Mage/src/main/java/mage/target/Targets.java @@ -1,22 +1,16 @@ package mage.target; -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; +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; /** * @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 eb80a4b633..5e1ca2be78 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 c9dfd125c5..6552c4bba0 100644 --- a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java @@ -4,7 +4,6 @@ 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 a4288bb200..f8e04dd2f2 100644 --- a/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java +++ b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbilityOrLegendarySpell.java @@ -1,10 +1,6 @@ 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; @@ -15,6 +11,10 @@ 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 db93aeb995..86721777d3 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java @@ -3,7 +3,6 @@ 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 9f7a379327..a68aa088f7 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInExile.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInExile.java @@ -4,7 +4,6 @@ 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 33df652b68..746ed21a6d 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java @@ -3,7 +3,6 @@ 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 75762d4326..c19aebe893 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyardOrBattlefield.java @@ -1,8 +1,5 @@ package mage.target.common; -import java.util.Set; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.constants.Zone; @@ -12,6 +9,9 @@ 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 c87ea5fde5..dd3a6be708 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInHand.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInHand.java @@ -1,9 +1,5 @@ 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; @@ -13,6 +9,10 @@ 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 b4687208b7..4ebbfa167f 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java @@ -1,7 +1,6 @@ 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 a6ebee83b7..e596adce26 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java @@ -3,7 +3,6 @@ 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 11740fdfb5..f9c867c1e3 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 7e3f274ea5..2c74ef554a 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java +++ b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java @@ -1,13 +1,9 @@ package mage.target.common; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - +import mage.constants.Zone; import mage.MageObject; import mage.abilities.Ability; -import mage.constants.Zone; import mage.filter.Filter; import mage.filter.common.FilterCreatureOrPlayer; import mage.game.Game; @@ -15,6 +11,10 @@ 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 60821c07b9..196d965365 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java @@ -1,9 +1,8 @@ package mage.target.common; -import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURE; - import mage.filter.StaticFilters; +import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURE; 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 4bdfd85221..642440373a 100644 --- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java +++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java @@ -2,7 +2,6 @@ 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 1ab48732ef..4bbc69cabc 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 d941264522..863c419b28 100644 --- a/Mage/src/main/java/mage/target/common/TargetDefender.java +++ b/Mage/src/main/java/mage/target/common/TargetDefender.java @@ -4,7 +4,6 @@ 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 1830710385..a88be8445f 100644 --- a/Mage/src/main/java/mage/target/common/TargetDiscard.java +++ b/Mage/src/main/java/mage/target/common/TargetDiscard.java @@ -1,17 +1,17 @@ package mage.target.common; -import java.util.UUID; - +import mage.constants.Zone; import mage.abilities.Ability; import mage.cards.Card; -import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.StaticFilters; -import mage.filter.predicate.other.OwnerIdPredicate; import mage.game.Game; import mage.target.TargetCard; +import java.util.UUID; +import mage.filter.StaticFilters; +import mage.filter.predicate.other.OwnerIdPredicate; + /** * * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java b/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java index 4e9db0b86e..766be3b681 100644 --- a/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java @@ -1,7 +1,5 @@ package mage.target.common; -import java.util.UUID; - import mage.MageObject; import mage.abilities.Ability; import mage.constants.Outcome; @@ -11,6 +9,8 @@ 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 da77af99cc..ecfd696f5c 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java @@ -1,10 +1,5 @@ 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; @@ -16,6 +11,11 @@ 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 671d3ec7bc..cee4973c4f 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java @@ -1,9 +1,5 @@ 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; @@ -15,6 +11,10 @@ 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 408b913c7f..adc75fae2c 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java @@ -1,10 +1,5 @@ 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; @@ -15,6 +10,11 @@ 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 bedb721e52..1575dcc4ba 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentOrSuspendedCard.java @@ -32,7 +32,6 @@ 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 910f5064ff..f2a846ba37 100644 --- a/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java @@ -32,7 +32,6 @@ 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 2461032abf..5efeb3552d 100644 --- a/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java +++ b/Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java @@ -4,7 +4,6 @@ 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 2299cd088e..82241949eb 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java @@ -5,7 +5,6 @@ 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 fcc3c1a9d2..06a2eaf0e4 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java @@ -1,10 +1,5 @@ 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; @@ -12,6 +7,11 @@ 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 7a5ac93c15..f4ca2f05c3 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java @@ -9,7 +9,6 @@ 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 a30f736f14..9d2779b4ef 100644 --- a/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java @@ -1,11 +1,6 @@ package mage.target.targetpointer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - +import java.util.*; 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 493c63de8b..6dd021c9ac 100644 --- a/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java @@ -3,7 +3,6 @@ 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 05787ab35b..206bfe2eb9 100644 --- a/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java @@ -10,7 +10,6 @@ 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 4eae2f58da..97df0a692d 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -1,5 +1,20 @@ 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; @@ -9,28 +24,6 @@ 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 5aa3208efe..a884ab3d75 100644 --- a/Mage/src/main/java/mage/util/ClassScanner.java +++ b/Mage/src/main/java/mage/util/ClassScanner.java @@ -4,13 +4,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.net.URL; -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.*; 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 9fa3ffcf59..38da6de811 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 f8cd4d4ad8..3089b441ab 100644 --- a/Mage/src/main/java/mage/util/JarVersion.java +++ b/Mage/src/main/java/mage/util/JarVersion.java @@ -1,5 +1,7 @@ package mage.util; +import org.apache.log4j.Logger; + import java.net.URL; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -7,8 +9,6 @@ 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 9315131b2e..d153fe9315 100644 --- a/Mage/src/main/java/mage/util/ManaUtil.java +++ b/Mage/src/main/java/mage/util/ManaUtil.java @@ -1,32 +1,15 @@ 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.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.costs.mana.*; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; -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.abilities.mana.*; import mage.cards.Card; import mage.choices.Choice; import mage.constants.ColoredManaSymbol; @@ -34,6 +17,8 @@ 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 9b2920e80d..37f6d78eb9 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.Color; +import java.awt.*; 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 07b9060377..a7863b6028 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 040a84bc2d..703d0eaf3e 100644 --- a/Mage/src/main/java/mage/util/TargetAddress.java +++ b/Mage/src/main/java/mage/util/TargetAddress.java @@ -4,7 +4,6 @@ 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 1e5dde5dc2..abbc57d354 100644 --- a/Mage/src/main/java/mage/util/functions/AbilityApplier.java +++ b/Mage/src/main/java/mage/util/functions/AbilityApplier.java @@ -2,7 +2,6 @@ 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 f799fea76e..6f5c35e93d 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 33223be492..adbf082868 100644 --- a/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java +++ b/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java @@ -1,11 +1,10 @@ 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 9ce87d8f51..ffde9aeca0 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 2ad029a2c8..2ca57fb0a2 100644 --- a/Mage/src/main/java/mage/util/functions/CardTypeApplier.java +++ b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java @@ -2,7 +2,6 @@ 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 a6108493c0..c838a8f756 100644 --- a/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java +++ b/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java @@ -1,7 +1,6 @@ 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 40cdcce4f6..8b20c8cccb 100644 --- a/Mage/src/main/java/mage/util/trace/TraceUtil.java +++ b/Mage/src/main/java/mage/util/trace/TraceUtil.java @@ -1,11 +1,5 @@ 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; @@ -20,6 +14,9 @@ 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 c9d4dd81ba..97ebc27bc0 100644 --- a/Mage/src/main/java/mage/watchers/Watcher.java +++ b/Mage/src/main/java/mage/watchers/Watcher.java @@ -1,28 +1,16 @@ 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 6b39a6d04c..75ee40a8d7 100644 --- a/Mage/src/main/java/mage/watchers/WatcherUtils.java +++ b/Mage/src/main/java/mage/watchers/WatcherUtils.java @@ -1,11 +1,10 @@ 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 f31e7e6421..7fba3a54de 100644 --- a/Mage/src/main/java/mage/watchers/Watchers.java +++ b/Mage/src/main/java/mage/watchers/Watchers.java @@ -1,12 +1,11 @@ package mage.watchers; -import java.util.HashMap; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - import mage.game.Game; import mage.game.events.GameEvent; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; + +import java.util.HashMap; /** * @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 14be64e5bd..3466db407f 100644 --- a/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java @@ -1,14 +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.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 718efe29b8..93a26edd10 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 60612abc0b..7a9bf240a9 100644 --- a/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AttackedOrBlockedThisCombatWatcher.java @@ -7,7 +7,6 @@ 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 b36a459079..72ea6cfae3 100644 --- a/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java @@ -1,11 +1,6 @@ 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; @@ -13,6 +8,11 @@ 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 9b5ec01e4c..7d70b8f10e 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java @@ -5,7 +5,6 @@ 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 247a7a9183..901ef40009 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedByOnlyOneCreatureThisCombatWatcher.java @@ -1,12 +1,7 @@ package mage.watchers.common; -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 java.util.*; 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 ab2072b2b5..70b08e29c3 100644 --- a/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java @@ -1,9 +1,6 @@ package mage.watchers.common; -import java.util.HashSet; -import java.util.Set; - import mage.MageObjectReference; import mage.constants.WatcherScope; import mage.game.Game; @@ -11,6 +8,9 @@ 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 14e605ea30..b70f17779b 100644 --- a/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java @@ -7,6 +7,8 @@ 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 bf4067947c..60be9cbbbe 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 17f7c048ac..0cb116c282 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 0d342be7b4..e6b9499a12 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java @@ -1,15 +1,16 @@ 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 012465c0d6..c865d22a31 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 0a73067aab..6ab8c8a952 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java @@ -4,6 +4,7 @@ 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 6b455d4cf7..3391c0bf9f 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java @@ -1,12 +1,6 @@ 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; @@ -14,6 +8,8 @@ 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 26642bb905..5fbaebb330 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java @@ -4,7 +4,6 @@ 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 d9bb1f1c7a..328c635311 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -1,17 +1,14 @@ 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 6c98d9343b..656868ad25 100644 --- a/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastSpellYourLastTurnWatcher.java @@ -1,14 +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.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 6184f0daf5..f2794367cc 100644 --- a/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java @@ -3,7 +3,6 @@ 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 95c5c92ec5..e8a093451a 100644 --- a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java @@ -1,9 +1,5 @@ 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; @@ -12,6 +8,10 @@ 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 8a84b876e6..df816d4d6d 100644 --- a/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreatureAttackedWhichPlayerWatcher.java @@ -1,14 +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.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 04bb477d0f..79da22b221 100644 --- a/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java @@ -4,7 +4,6 @@ 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 bab675ea6f..f97b7af069 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 7e5ddbc61b..6e4008ab16 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 7a364fe644..0d5ee938bd 100644 --- a/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java @@ -1,9 +1,5 @@ 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; @@ -14,6 +10,10 @@ 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 a13feb958f..80a1a329ee 100644 --- a/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/FirstSpellCastThisTurnWatcher.java @@ -3,7 +3,6 @@ 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 5ee8b2a522..86f25b35f8 100644 --- a/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java @@ -2,6 +2,7 @@ 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 ee198d95f2..2b4afc98bd 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 820f310938..71790be235 100644 --- a/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java @@ -4,7 +4,6 @@ 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 bbc22e42b0..30202fc773 100644 --- a/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java @@ -1,9 +1,5 @@ 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; @@ -16,6 +12,10 @@ 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 86ac94a0d8..e71a844b28 100644 --- a/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/NumberOfTimesPermanentTargetedATurnWatcher.java @@ -4,7 +4,6 @@ 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 930a93b334..9e74b0bae7 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java @@ -5,11 +5,7 @@ */ 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 java.util.*; 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 e093e01d6d..f0a2c4f20a 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java @@ -5,18 +5,14 @@ */ 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 9ea41e5298..c157be5f23 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java @@ -5,11 +5,7 @@ */ 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 java.util.*; 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 550c5f1a2a..bd44334499 100644 --- a/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java @@ -1,14 +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.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 a1147f36fe..d0af1cecc2 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 caa5fd0f6c..a710a145fa 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java @@ -4,7 +4,6 @@ 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 fddfb83ba1..591731ca84 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 22694a09fd..c30c552ec4 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java @@ -4,7 +4,6 @@ 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 7dd4ff58d8..4c24cc1d22 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java @@ -3,6 +3,7 @@ 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 751b91c8a1..348e72ba1d 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeNonCombatWatcher.java @@ -1,15 +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.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 7b4470014a..1b13d0957d 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java @@ -1,15 +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.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 44d58a381d..2b5f73c08a 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.players.PlayerList; import mage.watchers.Watcher; +import mage.players.PlayerList; /** * @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 1c735f7128..fe39ea98e8 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 2a88c45566..f7c1340904 100644 --- a/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java @@ -1,13 +1,6 @@ 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; @@ -18,6 +11,9 @@ 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 1a47380948..b2fb2e4ab7 100644 --- a/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/RevoltWatcher.java @@ -1,9 +1,5 @@ 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; @@ -13,6 +9,10 @@ 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 bf9ffc8940..f338ea1cb0 100644 --- a/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java @@ -1,16 +1,14 @@ 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 c33d1cf41a..883ab6f9ef 100644 --- a/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java @@ -5,11 +5,7 @@ */ 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 java.util.*; 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 da2d3be8a5..89ad6edb0d 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 d49cf4a526..8c48825e76 100644 --- a/Mage/src/test/java/mage/ContinuousEffectImplTest.java +++ b/Mage/src/test/java/mage/ContinuousEffectImplTest.java @@ -1,17 +1,16 @@ package mage; -import static org.hamcrest.CoreMatchers.is; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.constants.DependencyType; +import mage.constants.Duration; +import org.junit.Assert; +import org.junit.Test; import java.util.ArrayList; import java.util.Set; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; - -import mage.abilities.effects.common.continuous.BoostTargetEffect; -import mage.constants.DependencyType; -import mage.constants.Duration; +import static org.hamcrest.CoreMatchers.is; /** * 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 8ebe7d897b..6d12ac4de4 100644 --- a/Mage/src/test/java/mage/ManaSymbolTest.java +++ b/Mage/src/test/java/mage/ManaSymbolTest.java @@ -1,11 +1,9 @@ package mage; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.*; + /** * 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 4baddfaba0..9f971bddc4 100644 --- a/Mage/src/test/java/mage/ManaTest.java +++ b/Mage/src/test/java/mage/ManaTest.java @@ -1,16 +1,14 @@ 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 96a75d3eb2..7deb0cb70e 100644 --- a/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/exporter/MtgOnlineDeckExporterTest.java @@ -1,14 +1,13 @@ package mage.cards.decks.exporter; -import static org.junit.Assert.assertEquals; +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; +import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.junit.Test; - -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.assertEquals; 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 767346d37c..f905f63a0e 100644 --- a/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/exporter/XmageDeckExporterTest.java @@ -1,14 +1,13 @@ package mage.cards.decks.exporter; -import static org.junit.Assert.assertEquals; +import mage.cards.decks.DeckCardInfo; +import mage.cards.decks.DeckCardLists; +import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.junit.Test; - -import mage.cards.decks.DeckCardInfo; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.assertEquals; 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 84d58e1dde..7c64308dd4 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/DraftLogImporterTest.java @@ -1,10 +1,9 @@ package mage.cards.decks.importer; -import static org.junit.Assert.assertEquals; - +import mage.cards.decks.DeckCardLists; import org.junit.Test; -import mage.cards.decks.DeckCardLists; +import static org.junit.Assert.*; 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 6256f62462..2db8dea404 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java @@ -1,10 +1,11 @@ package mage.cards.decks.importer; -import static org.junit.Assert.assertEquals; - +import mage.cards.decks.DeckCardLists; import org.junit.Test; -import mage.cards.decks.DeckCardLists; +import java.io.File; + +import static org.junit.Assert.*; 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 cce220790e..cf364d8108 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java +++ b/Mage/src/test/java/mage/cards/decks/importer/MwsDeckImportTest.java @@ -2,9 +2,14 @@ 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 8f4e744fee..e4f2543239 100644 --- a/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java +++ b/Mage/src/test/java/mage/cards/decks/importer/TestDeckChecker.java @@ -6,6 +6,8 @@ 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 4d971ee7d6..2bf57a6d36 100644 --- a/Mage/src/test/java/mage/counters/CounterTest.java +++ b/Mage/src/test/java/mage/counters/CounterTest.java @@ -1,8 +1,6 @@ package mage.counters; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; - +import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test;