From a8c70a903fbd1c4e5ed4502f547f8dd37e0ef0b8 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 24 Nov 2013 07:09:23 +0000 Subject: [PATCH] arrange packages --- .gitattributes | 752 +++++++++--------- .../{game => }/ai/AiAttackController.java | 6 +- .../{game => }/ai/AiBlockController.java | 8 +- .../forge/{game => }/ai/AiController.java | 23 +- .../forge/{game => }/ai/AiProfileUtil.java | 3 +- .../forge/{game => }/ai/ComputerUtil.java | 57 +- .../forge/{game => }/ai/ComputerUtilCard.java | 4 +- .../{game => }/ai/ComputerUtilCombat.java | 26 +- .../forge/{game => }/ai/ComputerUtilCost.java | 28 +- .../forge/{game => }/ai/ComputerUtilMana.java | 30 +- .../ability/ai => ai/ability}/AddPhaseAi.java | 6 +- .../ability/ai => ai/ability}/AddTurnAi.java | 8 +- .../ai => ai/ability}/AlwaysPlayAi.java | 6 +- .../ability/ai => ai/ability}/AnimateAi.java | 18 +- .../ai => ai/ability}/AnimateAllAi.java | 6 +- .../ability/ai => ai/ability}/AttachAi.java | 28 +- .../ability/ai => ai/ability}/BalanceAi.java | 6 +- .../ai => ai/ability}/BecomesBlockedAi.java | 10 +- .../ability/ai => ai/ability}/BondAi.java | 12 +- .../ability}/CanPlayAsDrawbackAi.java | 10 +- .../ai => ai/ability}/CannotPlayAi.java | 6 +- .../ai => ai/ability}/ChangeTargetsAi.java | 6 +- .../ai => ai/ability}/ChangeZoneAi.java | 84 +- .../ai => ai/ability}/ChangeZoneAllAi.java | 20 +- .../ability/ai => ai/ability}/CharmAi.java | 10 +- .../ai => ai/ability}/ChooseCardAi.java | 13 +- .../ai => ai/ability}/ChooseCardNameAi.java | 12 +- .../ai => ai/ability}/ChooseColorAi.java | 6 +- .../ai => ai/ability}/ChoosePlayerAi.java | 8 +- .../ai => ai/ability}/ChooseSourceAi.java | 18 +- .../ai => ai/ability}/ChooseTypeAi.java | 8 +- .../ability/ai => ai/ability}/ClashAi.java | 8 +- .../ability/ai => ai/ability}/CloneAi.java | 14 +- .../ai => ai/ability}/ControlExchangeAi.java | 12 +- .../ai => ai/ability}/ControlGainAi.java | 12 +- .../ai => ai/ability}/CopyPermanentAi.java | 10 +- .../ability/ai => ai/ability}/CounterAi.java | 16 +- .../ability/ai => ai/ability}/CountersAi.java | 4 +- .../ai => ai/ability}/CountersMoveAi.java | 12 +- .../ability}/CountersProliferateAi.java | 8 +- .../ai => ai/ability}/CountersPutAi.java | 20 +- .../ai => ai/ability}/CountersPutAllAi.java | 18 +- .../ability}/CountersPutOrRemoveAi.java | 8 +- .../ai => ai/ability}/CountersRemoveAi.java | 14 +- .../ai => ai/ability}/DamageAiBase.java | 8 +- .../ai => ai/ability}/DamageAllAi.java | 24 +- .../ai => ai/ability}/DamageDealAi.java | 38 +- .../ai => ai/ability}/DamageEachAi.java | 8 +- .../ai => ai/ability}/DamagePreventAi.java | 24 +- .../ai => ai/ability}/DamagePreventAllAi.java | 10 +- .../ability/ai => ai/ability}/DebuffAi.java | 30 +- .../ai => ai/ability}/DebuffAllAi.java | 6 +- .../ai => ai/ability}/DelayedTriggerAi.java | 10 +- .../ability/ai => ai/ability}/DestroyAi.java | 22 +- .../ai => ai/ability}/DestroyAllAi.java | 14 +- .../ability/ai => ai/ability}/DigAi.java | 10 +- .../ability/ai => ai/ability}/DigUntilAi.java | 10 +- .../ability/ai => ai/ability}/DiscardAi.java | 18 +- .../ai => ai/ability}/DrainManaAi.java | 10 +- .../ability/ai => ai/ability}/DrawAi.java | 26 +- .../ability/ai => ai/ability}/EffectAi.java | 16 +- .../ability/ai => ai/ability}/EncodeAi.java | 12 +- .../ability/ai => ai/ability}/EndTurnAi.java | 6 +- .../ability/ai => ai/ability}/FightAi.java | 14 +- .../ai => ai/ability}/FlipACoinAi.java | 6 +- .../ability/ai => ai/ability}/FogAi.java | 8 +- .../ability/ai => ai/ability}/GameLossAi.java | 8 +- .../ability/ai => ai/ability}/GameWinAi.java | 6 +- .../ai => ai/ability}/LegendaryRuleAi.java | 6 +- .../ai => ai/ability}/LifeExchangeAi.java | 8 +- .../ability/ai => ai/ability}/LifeGainAi.java | 26 +- .../ability/ai => ai/ability}/LifeLoseAi.java | 19 +- .../ability/ai => ai/ability}/LifeSetAi.java | 12 +- .../ai => ai/ability}/ManaEffectAi.java | 12 +- .../ability/ai => ai/ability}/MillAi.java | 18 +- .../ai => ai/ability}/MustAttackAi.java | 6 +- .../ai => ai/ability}/MustBlockAi.java | 14 +- .../ai => ai/ability}/PeekAndRevealAi.java | 8 +- .../ability}/PermanentCreatureAi.java | 8 +- .../ability}/PermanentNoncreatureAi.java | 8 +- .../ability/ai => ai/ability}/PhasesAi.java | 20 +- .../ability/ai => ai/ability}/PlayAi.java | 22 +- .../ability/ai => ai/ability}/PoisonAi.java | 16 +- .../ai => ai/ability}/PowerExchangeAi.java | 12 +- .../ability/ai => ai/ability}/ProtectAi.java | 24 +- .../ai => ai/ability}/ProtectAllAi.java | 10 +- .../ability/ai => ai/ability}/PumpAi.java | 26 +- .../ability/ai => ai/ability}/PumpAiBase.java | 14 +- .../ability/ai => ai/ability}/PumpAllAi.java | 14 +- .../ability}/RearrangeTopOfLibraryAi.java | 8 +- .../ai => ai/ability}/RegenerateAi.java | 20 +- .../ai => ai/ability}/RegenerateAllAi.java | 14 +- .../ai => ai/ability}/RemoveFromCombatAi.java | 6 +- .../ability/ai => ai/ability}/RepeatAi.java | 12 +- .../ai => ai/ability}/RepeatEachAi.java | 6 +- .../ai => ai/ability}/RestartGameAi.java | 6 +- .../ability/ai => ai/ability}/RevealAi.java | 10 +- .../ai => ai/ability}/RevealAiBase.java | 8 +- .../ai => ai/ability}/RevealHandAi.java | 10 +- .../ai => ai/ability}/RollPlanarDiceAi.java | 8 +- .../ai => ai/ability}/SacrificeAi.java | 14 +- .../ai => ai/ability}/SacrificeAllAi.java | 14 +- .../ability/ai => ai/ability}/ScryAi.java | 8 +- .../ability/ai => ai/ability}/SetStateAi.java | 6 +- .../ability/ai => ai/ability}/ShuffleAi.java | 6 +- .../ai => ai/ability}/StoreSVarAi.java | 12 +- .../ability/ai => ai/ability}/TapAi.java | 12 +- .../ability/ai => ai/ability}/TapAiBase.java | 26 +- .../ability/ai => ai/ability}/TapAllAi.java | 8 +- .../ai => ai/ability}/TapOrUntapAi.java | 8 +- .../ai => ai/ability}/TapOrUntapAllAi.java | 6 +- .../ability/ai => ai/ability}/TokenAi.java | 20 +- .../ability/ai => ai/ability}/TwoPilesAi.java | 10 +- .../ai => ai/ability}/UnattachAllAi.java | 16 +- .../ability/ai => ai/ability}/UntapAi.java | 32 +- .../ability/ai => ai/ability}/UntapAllAi.java | 8 +- .../ai => ai/ability}/ZoneExchangeAi.java | 11 +- .../java/forge/card/CardCharacteristics.java | 8 +- .../java/forge/card/ability/package-info.java | 3 - .../forge/card/cardfactory/CardFactory.java | 32 +- .../cardfactory/CardFactoryCreatures.java | 8 +- .../card/cardfactory/CardFactoryUtil.java | 70 +- .../forge/card/replacement/package-info.java | 3 - .../forge/card/spellability/package-info.java | 3 - .../card/staticability/package-info.java | 3 - .../java/forge/card/trigger/package-info.java | 3 - forge-gui/src/main/java/forge/game/Game.java | 8 +- .../src/main/java/forge/game/GameAction.java | 23 +- .../main/java/forge/game/GameActionUtil.java | 26 +- .../java/forge/game/GameLogFormatter.java | 2 +- .../src/main/java/forge/game/GameNew.java | 8 +- .../src/main/java/forge/game/GameObject.java | 2 +- .../src/main/java/forge/game/PlanarDice.java | 2 +- .../main/java/forge/game/StaticEffect.java | 4 +- .../main/java/forge/game/StaticEffects.java | 5 +- .../TriggerReplacementBase.java | 9 +- .../ability/AbilityApiBased.java | 18 +- .../ability/AbilityFactory.java | 22 +- .../{card => game}/ability/AbilityUtils.java | 30 +- .../forge/{card => game}/ability/ApiType.java | 6 +- .../ability/SaTargetRoutines.java | 4 +- .../ability/SpellAbilityAi.java | 16 +- .../ability/SpellAbilityEffect.java | 6 +- .../{card => game}/ability/SpellApiBased.java | 18 +- .../ability/effects/AbandonEffect.java | 8 +- .../ability/effects/AddPhaseEffect.java | 6 +- .../ability/effects/AddTurnEffect.java | 8 +- .../ability/effects/AnimateAllEffect.java | 20 +- .../ability/effects/AnimateEffect.java | 20 +- .../ability/effects/AnimateEffectBase.java | 14 +- .../ability/effects/AttachEffect.java | 12 +- .../ability/effects/BalanceEffect.java | 6 +- .../ability/effects/BecomesBlockedEffect.java | 10 +- .../ability/effects/BondEffect.java | 8 +- .../ability/effects/ChangeTargetsEffect.java | 10 +- .../ability/effects/ChangeZoneAllEffect.java | 8 +- .../ability/effects/ChangeZoneEffect.java | 48 +- .../ability/effects/CharmEffect.java | 10 +- .../ability/effects/ChooseCardEffect.java | 8 +- .../ability/effects/ChooseCardNameEffect.java | 12 +- .../ability/effects/ChooseColorEffect.java | 10 +- .../ability/effects/ChooseGenericEffect.java | 14 +- .../ability/effects/ChooseNumberEffect.java | 8 +- .../ability/effects/ChoosePlayerEffect.java | 10 +- .../ability/effects/ChooseSourceEffect.java | 19 +- .../ability/effects/ChooseTypeEffect.java | 8 +- .../ability/effects/ClashEffect.java | 14 +- .../ability/effects/CleanUpEffect.java | 8 +- .../ability/effects/CloneEffect.java | 14 +- .../effects/ControlExchangeEffect.java | 10 +- .../ability/effects/ControlGainEffect.java | 10 +- .../ability/effects/ControlPlayerEffect.java | 6 +- .../ability/effects/CopyPermanentEffect.java | 12 +- .../effects/CopySpellAbilityEffect.java | 8 +- .../ability/effects/CounterEffect.java | 20 +- .../ability/effects/CountersMoveEffect.java | 8 +- .../effects/CountersProliferateEffect.java | 8 +- .../ability/effects/CountersPutAllEffect.java | 10 +- .../ability/effects/CountersPutEffect.java | 11 +- .../effects/CountersPutOrRemoveEffect.java | 8 +- .../effects/CountersRemoveAllEffect.java | 8 +- .../ability/effects/CountersRemoveEffect.java | 10 +- .../ability/effects/DamageAllEffect.java | 8 +- .../ability/effects/DamageDealEffect.java | 8 +- .../ability/effects/DamageEachEffect.java | 8 +- .../effects/DamagePreventAllEffect.java | 8 +- .../ability/effects/DamagePreventEffect.java | 8 +- .../ability/effects/DebuffAllEffect.java | 10 +- .../ability/effects/DebuffEffect.java | 6 +- .../effects/DeclareCombatantsEffect.java | 6 +- .../ability/effects/DelayedTriggerEffect.java | 12 +- .../ability/effects/DestroyAllEffect.java | 8 +- .../ability/effects/DestroyEffect.java | 8 +- .../ability/effects/DigEffect.java | 12 +- .../ability/effects/DigUntilEffect.java | 10 +- .../ability/effects/DiscardEffect.java | 10 +- .../ability/effects/DrainManaEffect.java | 8 +- .../ability/effects/DrawEffect.java | 10 +- .../ability/effects/ETBReplacementEffect.java | 6 +- .../ability/effects/EffectEffect.java | 24 +- .../ability/effects/EncodeEffect.java | 10 +- .../ability/effects/EndTurnEffect.java | 6 +- .../ability/effects/FightEffect.java | 10 +- .../ability/effects/FlipCoinEffect.java | 15 +- .../ability/effects/FogEffect.java | 6 +- .../ability/effects/GameLossEffect.java | 6 +- .../ability/effects/GameWinEffect.java | 6 +- .../ability/effects/LifeExchangeEffect.java | 6 +- .../ability/effects/LifeGainEffect.java | 10 +- .../ability/effects/LifeLoseEffect.java | 10 +- .../ability/effects/LifeSetEffect.java | 10 +- .../ability/effects/ManaEffect.java | 18 +- .../ability/effects/ManaReflectedEffect.java | 12 +- .../ability/effects/MillEffect.java | 10 +- .../ability/effects/MustAttackEffect.java | 8 +- .../ability/effects/MustBlockEffect.java | 10 +- .../ability/effects/PeekAndRevealEffect.java | 8 +- .../effects/PermanentCreatureEffect.java | 6 +- .../effects/PermanentNoncreatureEffect.java | 6 +- .../ability/effects/PhasesEffect.java | 10 +- .../ability/effects/PlaneswalkEffect.java | 8 +- .../ability/effects/PlayEffect.java | 16 +- .../ability/effects/PoisonEffect.java | 10 +- .../ability/effects/PowerExchangeEffect.java | 6 +- .../ability/effects/ProtectAllEffect.java | 8 +- .../ability/effects/ProtectEffect.java | 10 +- .../ability/effects/PumpAllEffect.java | 8 +- .../ability/effects/PumpEffect.java | 10 +- .../effects/RearrangeTopOfLibraryEffect.java | 14 +- .../ability/effects/RegenerateAllEffect.java | 6 +- .../ability/effects/RegenerateEffect.java | 8 +- .../effects/RemoveFromCombatEffect.java | 8 +- .../ability/effects/ReorderZoneEffect.java | 10 +- .../ability/effects/RepeatEachEffect.java | 12 +- .../ability/effects/RepeatEffect.java | 16 +- .../ability/effects/RestartGameEffect.java | 12 +- .../ability/effects/RevealEffect.java | 10 +- .../ability/effects/RevealHandEffect.java | 8 +- .../ability/effects/RollPlanarDiceEffect.java | 6 +- .../ability/effects/SacrificeAllEffect.java | 8 +- .../ability/effects/SacrificeEffect.java | 10 +- .../ability/effects/ScryEffect.java | 12 +- .../ability/effects/SetInMotionEffect.java | 8 +- .../ability/effects/SetStateEffect.java | 6 +- .../ability/effects/ShuffleEffect.java | 8 +- .../ability/effects/SkipTurnEffect.java | 8 +- .../ability/effects/StoreSVarEffect.java | 8 +- .../ability/effects/TapAllEffect.java | 10 +- .../ability/effects/TapEffect.java | 8 +- .../ability/effects/TapOrUntapAllEffect.java | 8 +- .../ability/effects/TapOrUntapEffect.java | 8 +- .../ability/effects/TokenEffect.java | 14 +- .../ability/effects/TwoPilesEffect.java | 16 +- .../ability/effects/UnattachAllEffect.java | 6 +- .../ability/effects/UntapAllEffect.java | 8 +- .../ability/effects/UntapEffect.java | 16 +- .../ability/effects/ZoneExchangeEffect.java | 8 +- .../java/forge/game/ability/package-info.java | 3 + .../src/main/java/forge/game/card/Card.java | 54 +- .../main/java/forge/game/card/CardColor.java | 2 +- .../main/java/forge/game/card/CardLists.java | 4 +- .../java/forge/game/card/CardPredicates.java | 2 +- .../main/java/forge/game/card/CardUtil.java | 10 +- .../main/java/forge/game/combat/Combat.java | 2 +- .../java/forge/game/combat/CombatUtil.java | 12 +- .../java/forge/{card => game}/cost/Cost.java | 6 +- .../{card => game}/cost/CostAddMana.java | 8 +- .../forge/{card => game}/cost/CostDamage.java | 6 +- .../{card => game}/cost/CostDiscard.java | 8 +- .../forge/{card => game}/cost/CostDraw.java | 6 +- .../forge/{card => game}/cost/CostExile.java | 10 +- .../{card => game}/cost/CostExileAndPay.java | 10 +- .../cost/CostExiledMoveToGrave.java | 6 +- .../{card => game}/cost/CostFlipCoin.java | 8 +- .../{card => game}/cost/CostGainControl.java | 6 +- .../{card => game}/cost/CostGainLife.java | 6 +- .../forge/{card => game}/cost/CostMill.java | 6 +- .../forge/{card => game}/cost/CostPart.java | 16 +- .../{card => game}/cost/CostPartMana.java | 10 +- .../{card => game}/cost/CostPartWithList.java | 4 +- .../{card => game}/cost/CostPayLife.java | 6 +- .../{card => game}/cost/CostPayment.java | 14 +- .../{card => game}/cost/CostPutCardToLib.java | 8 +- .../{card => game}/cost/CostPutCounter.java | 8 +- .../cost/CostRemoveAnyCounter.java | 8 +- .../cost/CostRemoveCounter.java | 6 +- .../forge/{card => game}/cost/CostReturn.java | 8 +- .../forge/{card => game}/cost/CostReveal.java | 8 +- .../{card => game}/cost/CostSacrifice.java | 8 +- .../forge/{card => game}/cost/CostTap.java | 4 +- .../{card => game}/cost/CostTapType.java | 8 +- .../{card => game}/cost/CostUnattach.java | 4 +- .../forge/{card => game}/cost/CostUntap.java | 4 +- .../{card => game}/cost/CostUntapType.java | 8 +- .../{card => game}/cost/PaymentDecision.java | 2 +- .../{card => game}/cost/package-info.java | 2 +- .../forge/game/event/GameEventManaPool.java | 2 +- .../game/event/GameEventSpellAbilityCast.java | 2 +- .../event/GameEventSpellRemovedFromStack.java | 2 +- .../game/event/GameEventSpellResolved.java | 2 +- .../java/forge/{card => game}/mana/Mana.java | 6 +- .../mana/ManaCostBeingPaid.java | 12 +- .../forge/{card => game}/mana/ManaPool.java | 21 +- .../{card => game}/mana/package-info.java | 2 +- .../main/java/forge/game/phase/EndOfTurn.java | 6 +- .../java/forge/game/phase/PhaseHandler.java | 10 +- .../src/main/java/forge/game/phase/Untap.java | 2 +- .../main/java/forge/game/phase/Upkeep.java | 10 +- .../java/forge/game/player/HumanPlay.java | 74 +- .../java/forge/game/player/LobbyPlayerAi.java | 2 +- .../main/java/forge/game/player/Player.java | 20 +- .../forge/game/player/PlayerController.java | 14 +- .../forge/game/player/PlayerControllerAi.java | 36 +- .../game/player/PlayerControllerHuman.java | 18 +- .../replacement/ReplaceCounter.java | 4 +- .../replacement/ReplaceDamage.java | 4 +- .../replacement/ReplaceDestroy.java | 4 +- .../replacement/ReplaceDiscard.java | 4 +- .../replacement/ReplaceDraw.java | 4 +- .../replacement/ReplaceGainLife.java | 4 +- .../replacement/ReplaceGameLoss.java | 2 +- .../replacement/ReplaceMoved.java | 4 +- .../replacement/ReplaceProduceMana.java | 4 +- .../replacement/ReplaceSetInMotion.java | 2 +- .../replacement/ReplaceTurnFaceUp.java | 4 +- .../replacement/ReplaceUntap.java | 4 +- .../replacement/ReplacementEffect.java | 8 +- .../replacement/ReplacementHandler.java | 8 +- .../replacement/ReplacementLayer.java | 2 +- .../replacement/ReplacementResult.java | 2 +- .../replacement/ReplacementType.java | 2 +- .../forge/game/replacement/package-info.java | 3 + .../{card => game}/spellability/Ability.java | 4 +- .../spellability/AbilityActivated.java | 12 +- .../spellability/AbilityManaPart.java | 18 +- .../spellability/AbilityStatic.java | 4 +- .../spellability/AbilitySub.java | 24 +- .../spellability/AbilityTriggered.java | 6 +- .../spellability/HumanPlaySpellAbility.java | 8 +- .../spellability/ISpellAbility.java | 2 +- .../spellability/OptionalCost.java | 2 +- .../{card => game}/spellability/Spell.java | 8 +- .../spellability/SpellAbility.java | 36 +- .../spellability/SpellAbilityCondition.java | 6 +- .../spellability/SpellAbilityRestriction.java | 12 +- .../SpellAbilityStackInstance.java | 8 +- .../spellability/SpellAbilityVariables.java | 2 +- .../spellability/SpellPermanent.java | 22 +- .../spellability/TargetChoices.java | 4 +- .../spellability/TargetRestrictions.java | 16 +- .../spellability/TargetSelection.java | 2 +- .../forge/game/spellability/package-info.java | 3 + .../staticability/StaticAbility.java | 10 +- .../StaticAbilityCantAttackBlock.java | 4 +- .../StaticAbilityCantBeCast.java | 4 +- .../StaticAbilityCantTarget.java | 4 +- .../StaticAbilityContinuous.java | 20 +- .../StaticAbilityCostChange.java | 12 +- .../staticability/StaticAbilityETBTapped.java | 2 +- .../staticability/StaticAbilityMayLookAt.java | 2 +- .../StaticAbilityPreventDamage.java | 2 +- .../game/staticability/package-info.java | 3 + .../forge/{card => game}/trigger/Trigger.java | 12 +- .../{card => game}/trigger/TriggerAlways.java | 4 +- .../trigger/TriggerAttached.java | 4 +- .../trigger/TriggerAttackerBlocked.java | 4 +- .../trigger/TriggerAttackerUnblocked.java | 4 +- .../trigger/TriggerAttackersDeclared.java | 4 +- .../trigger/TriggerAttacks.java | 4 +- .../trigger/TriggerBecomeMonstrous.java | 4 +- .../trigger/TriggerBecomesTarget.java | 4 +- .../trigger/TriggerBlockersDeclared.java | 4 +- .../{card => game}/trigger/TriggerBlocks.java | 4 +- .../trigger/TriggerChampioned.java | 4 +- .../trigger/TriggerChangesController.java | 4 +- .../trigger/TriggerChangesZone.java | 6 +- .../trigger/TriggerClashed.java | 4 +- .../trigger/TriggerCombatDamageDoneOnce.java | 4 +- .../trigger/TriggerCounterAdded.java | 4 +- .../trigger/TriggerCounterRemoved.java | 4 +- .../trigger/TriggerCountered.java | 4 +- .../{card => game}/trigger/TriggerCycled.java | 4 +- .../trigger/TriggerDamageDone.java | 4 +- .../trigger/TriggerDestroyed.java | 4 +- .../trigger/TriggerDevoured.java | 4 +- .../trigger/TriggerDiscarded.java | 4 +- .../{card => game}/trigger/TriggerDrawn.java | 4 +- .../trigger/TriggerEvolved.java | 4 +- .../trigger/TriggerFlippedCoin.java | 4 +- .../trigger/TriggerHandler.java | 20 +- .../trigger/TriggerLandPlayed.java | 4 +- .../trigger/TriggerLifeGained.java | 4 +- .../trigger/TriggerLifeLost.java | 4 +- .../trigger/TriggerLosesGame.java | 4 +- .../trigger/TriggerNewGame.java | 4 +- .../trigger/TriggerPayCumulativeUpkeep.java | 4 +- .../{card => game}/trigger/TriggerPhase.java | 4 +- .../trigger/TriggerPlanarDice.java | 4 +- .../trigger/TriggerPlaneswalkedFrom.java | 4 +- .../trigger/TriggerPlaneswalkedTo.java | 4 +- .../trigger/TriggerSacrificed.java | 4 +- .../{card => game}/trigger/TriggerScry.java | 4 +- .../trigger/TriggerSetInMotion.java | 4 +- .../trigger/TriggerShuffled.java | 4 +- .../trigger/TriggerSpellAbilityCast.java | 12 +- .../{card => game}/trigger/TriggerTaps.java | 4 +- .../trigger/TriggerTapsForMana.java | 4 +- .../trigger/TriggerTransformed.java | 4 +- .../trigger/TriggerTurnFaceUp.java | 4 +- .../{card => game}/trigger/TriggerType.java | 2 +- .../trigger/TriggerUnequip.java | 4 +- .../{card => game}/trigger/TriggerUntaps.java | 4 +- .../trigger/TriggerWaiting.java | 2 +- .../trigger/WrappedAbility.java | 20 +- .../{card => game}/trigger/ZCTrigger.java | 4 +- .../java/forge/game/trigger/package-info.java | 3 + .../main/java/forge/game/zone/MagicStack.java | 42 +- .../main/java/forge/game/zone/PlayerZone.java | 2 +- .../game/zone/PlayerZoneBattlefield.java | 4 +- .../src/main/java/forge/gui/DualListBox.java | 2 +- .../main/java/forge/gui/GuiDisplayUtil.java | 6 +- .../src/main/java/forge/gui/InputProxy.java | 2 +- .../home/settings/CSubmenuPreferences.java | 2 +- .../src/main/java/forge/gui/input/Input.java | 2 +- .../java/forge/gui/input/InputAttack.java | 2 +- .../main/java/forge/gui/input/InputBase.java | 2 +- .../java/forge/gui/input/InputLockUI.java | 2 +- .../forge/gui/input/InputPassPriority.java | 2 +- .../java/forge/gui/input/InputPayMana.java | 16 +- .../input/InputPayManaExecuteCommands.java | 6 +- .../gui/input/InputPayManaOfCostPayment.java | 4 +- .../forge/gui/input/InputPayManaSimple.java | 4 +- .../java/forge/gui/input/InputPayManaX.java | 4 +- .../forge/gui/input/InputSelectTargets.java | 6 +- .../forge/gui/match/nonsingleton/CField.java | 2 +- .../java/forge/gui/match/views/VStack.java | 2 +- .../toolbox/special/PlayerDetailsPanel.java | 2 +- .../src/main/java/forge/model/FModel.java | 2 +- .../forge/properties/ForgePreferences.java | 2 +- .../java/forge/sound/EventVisualizer.java | 2 +- .../java/forge/card/mana/ManaPartTest.java | 4 +- 441 files changed, 2571 insertions(+), 2558 deletions(-) rename forge-gui/src/main/java/forge/{game => }/ai/AiAttackController.java (99%) rename forge-gui/src/main/java/forge/{game => }/ai/AiBlockController.java (99%) rename forge-gui/src/main/java/forge/{game => }/ai/AiController.java (98%) rename forge-gui/src/main/java/forge/{game => }/ai/AiProfileUtil.java (99%) rename forge-gui/src/main/java/forge/{game => }/ai/ComputerUtil.java (98%) rename forge-gui/src/main/java/forge/{game => }/ai/ComputerUtilCard.java (96%) rename forge-gui/src/main/java/forge/{game => }/ai/ComputerUtilCombat.java (96%) rename forge-gui/src/main/java/forge/{game => }/ai/ComputerUtilCost.java (93%) rename forge-gui/src/main/java/forge/{game => }/ai/ComputerUtilMana.java (95%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AddPhaseAi.java (64%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AddTurnAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AlwaysPlayAi.java (73%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AnimateAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AnimateAllAi.java (74%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/AttachAi.java (96%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/BalanceAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/BecomesBlockedAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/BondAi.java (81%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CanPlayAsDrawbackAi.java (78%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CannotPlayAi.java (82%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChangeTargetsAi.java (79%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChangeZoneAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChangeZoneAllAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CharmAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChooseCardAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChooseCardNameAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChooseColorAi.java (80%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChoosePlayerAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChooseSourceAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ChooseTypeAi.java (80%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ClashAi.java (82%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CloneAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ControlExchangeAi.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ControlGainAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CopyPermanentAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CounterAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersAi.java (98%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersMoveAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersProliferateAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersPutAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersPutAllAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersPutOrRemoveAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/CountersRemoveAi.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamageAiBase.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamageAllAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamageDealAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamageEachAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamagePreventAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DamagePreventAllAi.java (86%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DebuffAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DebuffAllAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DelayedTriggerAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DestroyAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DestroyAllAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DigAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DigUntilAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DiscardAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DrainManaAi.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/DrawAi.java (95%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/EffectAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/EncodeAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/EndTurnAi.java (81%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/FightAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/FlipACoinAi.java (81%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/FogAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/GameLossAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/GameWinAi.java (84%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/LegendaryRuleAi.java (87%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/LifeExchangeAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/LifeGainAi.java (87%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/LifeLoseAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/LifeSetAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ManaEffectAi.java (67%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/MillAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/MustAttackAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/MustBlockAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PeekAndRevealAi.java (84%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PermanentCreatureAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PermanentNoncreatureAi.java (82%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PhasesAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PlayAi.java (86%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PoisonAi.java (86%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PowerExchangeAi.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ProtectAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ProtectAllAi.java (83%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PumpAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PumpAiBase.java (96%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/PumpAllAi.java (93%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RearrangeTopOfLibraryAi.java (84%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RegenerateAi.java (95%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RegenerateAllAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RemoveFromCombatAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RepeatAi.java (81%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RepeatEachAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RestartGameAi.java (84%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RevealAi.java (86%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RevealAiBase.java (84%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RevealHandAi.java (87%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/RollPlanarDiceAi.java (95%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/SacrificeAi.java (92%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/SacrificeAllAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ScryAi.java (87%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/SetStateAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ShuffleAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/StoreSVarAi.java (90%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TapAi.java (85%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TapAiBase.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TapAllAi.java (94%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TapOrUntapAi.java (86%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TapOrUntapAllAi.java (79%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TokenAi.java (91%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/TwoPilesAi.java (87%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/UnattachAllAi.java (88%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/UntapAi.java (89%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/UntapAllAi.java (82%) rename forge-gui/src/main/java/forge/{card/ability/ai => ai/ability}/ZoneExchangeAi.java (89%) delete mode 100644 forge-gui/src/main/java/forge/card/ability/package-info.java delete mode 100644 forge-gui/src/main/java/forge/card/replacement/package-info.java delete mode 100644 forge-gui/src/main/java/forge/card/spellability/package-info.java delete mode 100644 forge-gui/src/main/java/forge/card/staticability/package-info.java delete mode 100644 forge-gui/src/main/java/forge/card/trigger/package-info.java rename forge-gui/src/main/java/forge/{card => game}/TriggerReplacementBase.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/AbilityApiBased.java (80%) rename forge-gui/src/main/java/forge/{card => game}/ability/AbilityFactory.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/AbilityUtils.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/ApiType.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/SaTargetRoutines.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/SpellAbilityAi.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/SpellAbilityEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/SpellApiBased.java (79%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AbandonEffect.java (80%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AddPhaseEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AddTurnEffect.java (89%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AnimateAllEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AnimateEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AnimateEffectBase.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/AttachEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/BalanceEffect.java (92%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/BecomesBlockedEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/BondEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChangeTargetsEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChangeZoneAllEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChangeZoneEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CharmEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseCardEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseCardNameEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseColorEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseGenericEffect.java (86%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseNumberEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChoosePlayerEffect.java (87%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseSourceEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ChooseTypeEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ClashEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CleanUpEffect.java (84%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CloneEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ControlExchangeEffect.java (89%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ControlGainEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ControlPlayerEffect.java (89%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CopyPermanentEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CopySpellAbilityEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CounterEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersMoveEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersProliferateEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersPutAllEffect.java (89%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersPutEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersPutOrRemoveEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersRemoveAllEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/CountersRemoveEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DamageAllEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DamageDealEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DamageEachEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DamagePreventAllEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DamagePreventEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DebuffAllEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DebuffEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DeclareCombatantsEffect.java (92%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DelayedTriggerEffect.java (83%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DestroyAllEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DestroyEffect.java (92%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DigEffect.java (96%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DigUntilEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DiscardEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DrainManaEffect.java (79%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/DrawEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ETBReplacementEffect.java (68%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/EffectEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/EncodeEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/EndTurnEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/FightEffect.java (89%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/FlipCoinEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/FogEffect.java (76%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/GameLossEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/GameWinEffect.java (76%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/LifeExchangeEffect.java (92%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/LifeGainEffect.java (84%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/LifeLoseEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/LifeSetEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ManaEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ManaReflectedEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/MillEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/MustAttackEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/MustBlockEffect.java (87%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PeekAndRevealEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PermanentCreatureEffect.java (86%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PermanentNoncreatureEffect.java (84%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PhasesEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PlaneswalkEffect.java (81%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PlayEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PoisonEffect.java (86%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PowerExchangeEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ProtectAllEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ProtectEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PumpAllEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/PumpEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RearrangeTopOfLibraryEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RegenerateAllEffect.java (87%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RegenerateEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RemoveFromCombatEffect.java (84%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ReorderZoneEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RepeatEachEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RepeatEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RestartGameEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RevealEffect.java (91%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RevealHandEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/RollPlanarDiceEffect.java (84%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/SacrificeAllEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/SacrificeEffect.java (93%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ScryEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/SetInMotionEffect.java (78%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/SetStateEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ShuffleEffect.java (86%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/SkipTurnEffect.java (83%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/StoreSVarEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TapAllEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TapEffect.java (85%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TapOrUntapAllEffect.java (90%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TapOrUntapEffect.java (88%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TokenEffect.java (97%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/TwoPilesEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/UnattachAllEffect.java (95%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/UntapAllEffect.java (87%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/UntapEffect.java (86%) rename forge-gui/src/main/java/forge/{card => game}/ability/effects/ZoneExchangeEffect.java (92%) create mode 100644 forge-gui/src/main/java/forge/game/ability/package-info.java rename forge-gui/src/main/java/forge/{card => game}/cost/Cost.java (99%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostAddMana.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostDamage.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostDiscard.java (96%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostDraw.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostExile.java (96%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostExileAndPay.java (93%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostExiledMoveToGrave.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostFlipCoin.java (93%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostGainControl.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostGainLife.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostMill.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPart.java (88%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPartMana.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPartWithList.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPayLife.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPayment.java (93%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPutCardToLib.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostPutCounter.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostRemoveAnyCounter.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostRemoveCounter.java (96%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostReturn.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostReveal.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostSacrifice.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostTap.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostTapType.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostUnattach.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostUntap.java (94%) rename forge-gui/src/main/java/forge/{card => game}/cost/CostUntapType.java (95%) rename forge-gui/src/main/java/forge/{card => game}/cost/PaymentDecision.java (91%) rename forge-gui/src/main/java/forge/{card => game}/cost/package-info.java (50%) rename forge-gui/src/main/java/forge/{card => game}/mana/Mana.java (97%) rename forge-gui/src/main/java/forge/{card => game}/mana/ManaCostBeingPaid.java (98%) rename forge-gui/src/main/java/forge/{card => game}/mana/ManaPool.java (95%) rename forge-gui/src/main/java/forge/{card => game}/mana/package-info.java (50%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceCounter.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceDamage.java (95%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceDestroy.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceDiscard.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceDraw.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceGainLife.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceGameLoss.java (92%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceMoved.java (93%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceProduceMana.java (91%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceSetInMotion.java (95%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceTurnFaceUp.java (91%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplaceUntap.java (93%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplacementEffect.java (94%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplacementHandler.java (96%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplacementLayer.java (91%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplacementResult.java (75%) rename forge-gui/src/main/java/forge/{card => game}/replacement/ReplacementType.java (96%) create mode 100644 forge-gui/src/main/java/forge/game/replacement/package-info.java rename forge-gui/src/main/java/forge/{card => game}/spellability/Ability.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/AbilityActivated.java (94%) rename forge-gui/src/main/java/forge/{card => game}/spellability/AbilityManaPart.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/AbilityStatic.java (96%) rename forge-gui/src/main/java/forge/{card => game}/spellability/AbilitySub.java (85%) rename forge-gui/src/main/java/forge/{card => game}/spellability/AbilityTriggered.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/HumanPlaySpellAbility.java (98%) rename forge-gui/src/main/java/forge/{card => game}/spellability/ISpellAbility.java (76%) rename forge-gui/src/main/java/forge/{card => game}/spellability/OptionalCost.java (78%) rename forge-gui/src/main/java/forge/{card => game}/spellability/Spell.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellAbility.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellAbilityCondition.java (98%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellAbilityRestriction.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellAbilityStackInstance.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellAbilityVariables.java (99%) rename forge-gui/src/main/java/forge/{card => game}/spellability/SpellPermanent.java (96%) rename forge-gui/src/main/java/forge/{card => game}/spellability/TargetChoices.java (98%) rename forge-gui/src/main/java/forge/{card => game}/spellability/TargetRestrictions.java (97%) rename forge-gui/src/main/java/forge/{card => game}/spellability/TargetSelection.java (99%) create mode 100644 forge-gui/src/main/java/forge/game/spellability/package-info.java rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbility.java (99%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityCantAttackBlock.java (95%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityCantBeCast.java (98%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityCantTarget.java (94%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityContinuous.java (98%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityCostChange.java (95%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityETBTapped.java (94%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityMayLookAt.java (95%) rename forge-gui/src/main/java/forge/{card => game}/staticability/StaticAbilityPreventDamage.java (99%) create mode 100644 forge-gui/src/main/java/forge/game/staticability/package-info.java rename forge-gui/src/main/java/forge/{card => game}/trigger/Trigger.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAlways.java (95%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAttached.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAttackerBlocked.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAttackerUnblocked.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAttackersDeclared.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerAttacks.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerBecomeMonstrous.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerBecomesTarget.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerBlockersDeclared.java (92%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerBlocks.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerChampioned.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerChangesController.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerChangesZone.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerClashed.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerCombatDamageDoneOnce.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerCounterAdded.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerCounterRemoved.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerCountered.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerCycled.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerDamageDone.java (98%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerDestroyed.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerDevoured.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerDiscarded.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerDrawn.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerEvolved.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerFlippedCoin.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerHandler.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerLandPlayed.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerLifeGained.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerLifeLost.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerLosesGame.java (90%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerNewGame.java (92%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerPayCumulativeUpkeep.java (94%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerPhase.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerPlanarDice.java (92%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerPlaneswalkedFrom.java (92%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerPlaneswalkedTo.java (92%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerSacrificed.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerScry.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerSetInMotion.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerShuffled.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerSpellAbilityCast.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerTaps.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerTapsForMana.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerTransformed.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerTurnFaceUp.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerType.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerUnequip.java (97%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerUntaps.java (96%) rename forge-gui/src/main/java/forge/{card => game}/trigger/TriggerWaiting.java (91%) rename forge-gui/src/main/java/forge/{card => game}/trigger/WrappedAbility.java (93%) rename forge-gui/src/main/java/forge/{card => game}/trigger/ZCTrigger.java (96%) create mode 100644 forge-gui/src/main/java/forge/game/trigger/package-info.java diff --git a/.gitattributes b/.gitattributes index 88af6f4db0c..b5a11617f27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14689,383 +14689,132 @@ forge-gui/src/main/java/forge/FThreads.java -text forge-gui/src/main/java/forge/ImageCache.java svneol=native#text/plain forge-gui/src/main/java/forge/ImageLoader.java -text forge-gui/src/main/java/forge/Singletons.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/AiAttackController.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/AiBlockController.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/AiController.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/AiProfileUtil.java -text +forge-gui/src/main/java/forge/ai/ComputerUtil.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/ComputerUtilCard.java -text +forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java -text +forge-gui/src/main/java/forge/ai/ComputerUtilCost.java -text +forge-gui/src/main/java/forge/ai/ComputerUtilMana.java -text +forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java -text +forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java -text +forge-gui/src/main/java/forge/ai/ability/AnimateAi.java -text +forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/AttachAi.java -text +forge-gui/src/main/java/forge/ai/ability/BalanceAi.java -text +forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java -text +forge-gui/src/main/java/forge/ai/ability/BondAi.java -text +forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java -text +forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/CharmAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java -text +forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java -text +forge-gui/src/main/java/forge/ai/ability/ClashAi.java -text +forge-gui/src/main/java/forge/ai/ability/CloneAi.java -text +forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java -text +forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java -text +forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java -text +forge-gui/src/main/java/forge/ai/ability/CounterAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersAi.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java -text +forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java -text +forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java -text +forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java -text +forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java -text +forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java -text +forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/DebuffAi.java -text +forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java -text +forge-gui/src/main/java/forge/ai/ability/DestroyAi.java -text +forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/DigAi.java -text +forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java -text +forge-gui/src/main/java/forge/ai/ability/DiscardAi.java -text +forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java -text +forge-gui/src/main/java/forge/ai/ability/DrawAi.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/ability/EffectAi.java -text +forge-gui/src/main/java/forge/ai/ability/EncodeAi.java -text +forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java -text +forge-gui/src/main/java/forge/ai/ability/FightAi.java -text +forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java -text +forge-gui/src/main/java/forge/ai/ability/FogAi.java -text +forge-gui/src/main/java/forge/ai/ability/GameLossAi.java -text +forge-gui/src/main/java/forge/ai/ability/GameWinAi.java -text +forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java -text +forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java -text +forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java -text +forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java -text +forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java -text +forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java -text +forge-gui/src/main/java/forge/ai/ability/MillAi.java -text +forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java -text +forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java -text +forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java -text +forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java -text +forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java -text +forge-gui/src/main/java/forge/ai/ability/PhasesAi.java -text +forge-gui/src/main/java/forge/ai/ability/PlayAi.java -text +forge-gui/src/main/java/forge/ai/ability/PoisonAi.java -text +forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java -text +forge-gui/src/main/java/forge/ai/ability/ProtectAi.java -text +forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/PumpAi.java -text +forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java -text +forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java -text +forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java svneol=native#text/plain +forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java -text +forge-gui/src/main/java/forge/ai/ability/RepeatAi.java -text +forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java -text +forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java -text +forge-gui/src/main/java/forge/ai/ability/RevealAi.java -text +forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java -text +forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java -text +forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java -text +forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java -text +forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/ScryAi.java -text +forge-gui/src/main/java/forge/ai/ability/SetStateAi.java -text +forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java -text +forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java -text +forge-gui/src/main/java/forge/ai/ability/TapAi.java -text +forge-gui/src/main/java/forge/ai/ability/TapAiBase.java -text +forge-gui/src/main/java/forge/ai/ability/TapAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java -text +forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/TokenAi.java -text +forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java -text +forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/UntapAi.java -text +forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java -text +forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text forge-gui/src/main/java/forge/card/CardBlock.java -text forge-gui/src/main/java/forge/card/CardCharacteristics.java -text forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text forge-gui/src/main/java/forge/card/MetaSet.java -text -forge-gui/src/main/java/forge/card/TriggerReplacementBase.java -text forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text -forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java -text -forge-gui/src/main/java/forge/card/ability/AbilityFactory.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/AbilityUtils.java -text -forge-gui/src/main/java/forge/card/ability/ApiType.java -text -forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java -text -forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java -text -forge-gui/src/main/java/forge/card/ability/SpellAbilityEffect.java -text -forge-gui/src/main/java/forge/card/ability/SpellApiBased.java -text -forge-gui/src/main/java/forge/card/ability/ai/AddPhaseAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/AddTurnAi.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/ai/AlwaysPlayAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/AnimateAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/BondAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CannotPlayAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChangeTargetsAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CharmAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChooseColorAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChoosePlayerAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ChooseTypeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ClashAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamageEachAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DelayedTriggerAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DigAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/EndTurnAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/FightAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/FlipACoinAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/FogAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/GameLossAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/GameWinAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/LifeExchangeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ManaEffectAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/MillAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/MustAttackAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PeekAndRevealAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java -text -forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RearrangeTopOfLibraryAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RemoveFromCombatAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RepeatAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RestartGameAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RevealAiBase.java -text -forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ScryAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/SetStateAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ShuffleAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TapAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java -text -forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java -text -forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java -text -forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/AddPhaseEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/AddTurnEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseSourceEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ClashEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CleanUpEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ControlExchangeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ControlGainEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CopySpellAbilityEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CounterEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersMoveEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersProliferateEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersPutAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersPutEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersPutOrRemoveEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DamageAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DamageDealEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DamageEachEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DamagePreventAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DamagePreventEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DebuffAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DebuffEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DeclareCombatantsEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DelayedTriggerEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DestroyAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DestroyEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DigUntilEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DrainManaEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/DrawEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ETBReplacementEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/EffectEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/EncodeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/EndTurnEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/FightEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/FlipCoinEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/FogEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/GameLossEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/GameWinEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/LifeExchangeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/LifeGainEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/LifeLoseEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/LifeSetEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ManaEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ManaReflectedEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/MustAttackEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/MustBlockEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PeekAndRevealEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PermanentCreatureEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PermanentNoncreatureEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PhasesEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PlaneswalkEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PoisonEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PowerExchangeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ProtectAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ProtectEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PumpAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/PumpEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RearrangeTopOfLibraryEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RegenerateAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RegenerateEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RemoveFromCombatEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ReorderZoneEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RepeatEachEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RepeatEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RestartGameEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RevealEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RevealHandEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/RollPlanarDiceEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/SacrificeAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/SacrificeEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ScryEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/SetInMotionEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ShuffleEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/SkipTurnEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/StoreSVarEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/TapAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/TapEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/TokenEffect.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/ability/effects/TwoPilesEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/UnattachAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/UntapAllEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/UntapEffect.java -text -forge-gui/src/main/java/forge/card/ability/effects/ZoneExchangeEffect.java -text -forge-gui/src/main/java/forge/card/ability/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java svneol=native#text/plain forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java svneol=native#text/plain forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java svneol=native#text/plain forge-gui/src/main/java/forge/card/cardfactory/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/cost/Cost.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/cost/CostAddMana.java -text -forge-gui/src/main/java/forge/card/cost/CostDamage.java -text -forge-gui/src/main/java/forge/card/cost/CostDiscard.java -text -forge-gui/src/main/java/forge/card/cost/CostDraw.java -text -forge-gui/src/main/java/forge/card/cost/CostExile.java -text -forge-gui/src/main/java/forge/card/cost/CostExileAndPay.java -text -forge-gui/src/main/java/forge/card/cost/CostExiledMoveToGrave.java -text -forge-gui/src/main/java/forge/card/cost/CostFlipCoin.java -text -forge-gui/src/main/java/forge/card/cost/CostGainControl.java -text -forge-gui/src/main/java/forge/card/cost/CostGainLife.java -text -forge-gui/src/main/java/forge/card/cost/CostMill.java -text -forge-gui/src/main/java/forge/card/cost/CostPart.java -text -forge-gui/src/main/java/forge/card/cost/CostPartMana.java -text -forge-gui/src/main/java/forge/card/cost/CostPartWithList.java -text -forge-gui/src/main/java/forge/card/cost/CostPayLife.java -text -forge-gui/src/main/java/forge/card/cost/CostPayment.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/cost/CostPutCardToLib.java -text -forge-gui/src/main/java/forge/card/cost/CostPutCounter.java -text -forge-gui/src/main/java/forge/card/cost/CostRemoveAnyCounter.java -text -forge-gui/src/main/java/forge/card/cost/CostRemoveCounter.java -text -forge-gui/src/main/java/forge/card/cost/CostReturn.java -text -forge-gui/src/main/java/forge/card/cost/CostReveal.java -text -forge-gui/src/main/java/forge/card/cost/CostSacrifice.java -text -forge-gui/src/main/java/forge/card/cost/CostTap.java -text -forge-gui/src/main/java/forge/card/cost/CostTapType.java -text -forge-gui/src/main/java/forge/card/cost/CostUnattach.java -text -forge-gui/src/main/java/forge/card/cost/CostUntap.java -text -forge-gui/src/main/java/forge/card/cost/CostUntapType.java -text -forge-gui/src/main/java/forge/card/cost/PaymentDecision.java -text -forge-gui/src/main/java/forge/card/cost/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/mana/Mana.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/mana/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/card/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/replacement/ReplaceCounter.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceDamage.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceDestroy.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceDiscard.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceDraw.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceGainLife.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceGameLoss.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceMoved.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceProduceMana.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceSetInMotion.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceTurnFaceUp.java -text -forge-gui/src/main/java/forge/card/replacement/ReplaceUntap.java -text -forge-gui/src/main/java/forge/card/replacement/ReplacementEffect.java -text -forge-gui/src/main/java/forge/card/replacement/ReplacementHandler.java -text -forge-gui/src/main/java/forge/card/replacement/ReplacementLayer.java -text -forge-gui/src/main/java/forge/card/replacement/ReplacementResult.java -text -forge-gui/src/main/java/forge/card/replacement/ReplacementType.java -text -forge-gui/src/main/java/forge/card/replacement/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/Ability.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/AbilityActivated.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/AbilityManaPart.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/AbilityStatic.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/AbilitySub.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/ISpellAbility.java -text -forge-gui/src/main/java/forge/card/spellability/OptionalCost.java -text -forge-gui/src/main/java/forge/card/spellability/Spell.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellAbility.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellAbilityCondition.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellAbilityRestriction.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellAbilityVariables.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/SpellPermanent.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/TargetChoices.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/TargetSelection.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/staticability/StaticAbility.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantAttackBlock.java -text -forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java -text -forge-gui/src/main/java/forge/card/staticability/StaticAbilityContinuous.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/staticability/StaticAbilityCostChange.java -text -forge-gui/src/main/java/forge/card/staticability/StaticAbilityETBTapped.java -text -forge-gui/src/main/java/forge/card/staticability/StaticAbilityMayLookAt.java -text -forge-gui/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/staticability/package-info.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/Trigger.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerAlways.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerAttached.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerAttacks.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerBecomeMonstrous.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerBecomesTarget.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerBlockersDeclared.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerBlocks.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerChampioned.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerChangesController.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerChangesZone.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerClashed.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerCombatDamageDoneOnce.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerCounterAdded.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerCounterRemoved.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerCountered.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerCycled.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerDamageDone.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerDestroyed.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerDevoured.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerDiscarded.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerDrawn.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerEvolved.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerFlippedCoin.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerHandler.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerLandPlayed.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerLifeGained.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerLifeLost.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerLosesGame.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerNewGame.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerPayCumulativeUpkeep.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerPhase.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerPlanarDice.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerSacrificed.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerScry.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerSetInMotion.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerShuffled.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerTaps.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerTapsForMana.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerTransformed.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerType.java -text -forge-gui/src/main/java/forge/card/trigger/TriggerUnequip.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerUntaps.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/TriggerWaiting.java -text -forge-gui/src/main/java/forge/card/trigger/WrappedAbility.java -text -forge-gui/src/main/java/forge/card/trigger/ZCTrigger.java svneol=native#text/plain -forge-gui/src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/control/ChatArea.java -text forge-gui/src/main/java/forge/control/FControl.java -text forge-gui/src/main/java/forge/control/FControlGameEventHandler.java -text @@ -15099,15 +14848,129 @@ forge-gui/src/main/java/forge/game/Match.java -text forge-gui/src/main/java/forge/game/PlanarDice.java -text forge-gui/src/main/java/forge/game/StaticEffect.java svneol=native#text/plain forge-gui/src/main/java/forge/game/StaticEffects.java svneol=native#text/plain -forge-gui/src/main/java/forge/game/ai/AiAttackController.java svneol=native#text/plain -forge-gui/src/main/java/forge/game/ai/AiBlockController.java svneol=native#text/plain -forge-gui/src/main/java/forge/game/ai/AiController.java svneol=native#text/plain -forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java -text -forge-gui/src/main/java/forge/game/ai/ComputerUtil.java svneol=native#text/plain -forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java -text -forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java -text -forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java -text -forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java -text +forge-gui/src/main/java/forge/game/TriggerReplacementBase.java -text +forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java -text +forge-gui/src/main/java/forge/game/ability/AbilityFactory.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/ability/AbilityUtils.java -text +forge-gui/src/main/java/forge/game/ability/ApiType.java -text +forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java -text +forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java -text +forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java -text +forge-gui/src/main/java/forge/game/ability/SpellApiBased.java -text +forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java -text +forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text +forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text @@ -15123,6 +14986,37 @@ forge-gui/src/main/java/forge/game/combat/AttackingBand.java -text forge-gui/src/main/java/forge/game/combat/Combat.java svneol=native#text/plain forge-gui/src/main/java/forge/game/combat/CombatLki.java -text forge-gui/src/main/java/forge/game/combat/CombatUtil.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/cost/Cost.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/cost/CostAddMana.java -text +forge-gui/src/main/java/forge/game/cost/CostDamage.java -text +forge-gui/src/main/java/forge/game/cost/CostDiscard.java -text +forge-gui/src/main/java/forge/game/cost/CostDraw.java -text +forge-gui/src/main/java/forge/game/cost/CostExile.java -text +forge-gui/src/main/java/forge/game/cost/CostExileAndPay.java -text +forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java -text +forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java -text +forge-gui/src/main/java/forge/game/cost/CostGainControl.java -text +forge-gui/src/main/java/forge/game/cost/CostGainLife.java -text +forge-gui/src/main/java/forge/game/cost/CostMill.java -text +forge-gui/src/main/java/forge/game/cost/CostPart.java -text +forge-gui/src/main/java/forge/game/cost/CostPartMana.java -text +forge-gui/src/main/java/forge/game/cost/CostPartWithList.java -text +forge-gui/src/main/java/forge/game/cost/CostPayLife.java -text +forge-gui/src/main/java/forge/game/cost/CostPayment.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java -text +forge-gui/src/main/java/forge/game/cost/CostPutCounter.java -text +forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java -text +forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java -text +forge-gui/src/main/java/forge/game/cost/CostReturn.java -text +forge-gui/src/main/java/forge/game/cost/CostReveal.java -text +forge-gui/src/main/java/forge/game/cost/CostSacrifice.java -text +forge-gui/src/main/java/forge/game/cost/CostTap.java -text +forge-gui/src/main/java/forge/game/cost/CostTapType.java -text +forge-gui/src/main/java/forge/game/cost/CostUnattach.java -text +forge-gui/src/main/java/forge/game/cost/CostUntap.java -text +forge-gui/src/main/java/forge/game/cost/CostUntapType.java -text +forge-gui/src/main/java/forge/game/cost/PaymentDecision.java -text +forge-gui/src/main/java/forge/game/cost/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/game/event/EventValueChangeType.java -text forge-gui/src/main/java/forge/game/event/GameEvent.java -text forge-gui/src/main/java/forge/game/event/GameEventAnteCardsSelected.java -text @@ -15178,6 +15072,10 @@ forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java -text forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java svneol=native#text/plain forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java svneol=native#text/plain forge-gui/src/main/java/forge/game/limited/package-info.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/mana/Mana.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/mana/ManaPool.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/mana/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/game/package-info.java -text forge-gui/src/main/java/forge/game/phase/EndOfTurn.java svneol=native#text/plain forge-gui/src/main/java/forge/game/phase/ExtraTurn.java -text @@ -15203,6 +15101,108 @@ forge-gui/src/main/java/forge/game/player/PlayerStatistics.java -text forge-gui/src/main/java/forge/game/player/PlayerType.java svneol=native#text/plain forge-gui/src/main/java/forge/game/player/RegisteredPlayer.java -text forge-gui/src/main/java/forge/game/player/package-info.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java -text +forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java -text +forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java -text +forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java -text +forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java -text +forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java -text +forge-gui/src/main/java/forge/game/replacement/ReplacementType.java -text +forge-gui/src/main/java/forge/game/replacement/package-info.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/Ability.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/AbilitySub.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java -text +forge-gui/src/main/java/forge/game/spellability/OptionalCost.java -text +forge-gui/src/main/java/forge/game/spellability/Spell.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellAbility.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/TargetChoices.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/TargetSelection.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/spellability/package-info.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/staticability/StaticAbility.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java -text +forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java -text +forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java -text +forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java -text +forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java -text +forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/staticability/package-info.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/Trigger.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerScry.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerType.java -text +forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java -text +forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java -text +forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java svneol=native#text/plain +forge-gui/src/main/java/forge/game/trigger/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/game/zone/MagicStack.java svneol=native#text/plain forge-gui/src/main/java/forge/game/zone/PlayerZone.java svneol=native#text/plain forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java svneol=native#text/plain diff --git a/forge-gui/src/main/java/forge/game/ai/AiAttackController.java b/forge-gui/src/main/java/forge/ai/AiAttackController.java similarity index 99% rename from forge-gui/src/main/java/forge/game/ai/AiAttackController.java rename to forge-gui/src/main/java/forge/ai/AiAttackController.java index 6b95e14ac35..0a37c74d7c0 100644 --- a/forge-gui/src/main/java/forge/game/ai/AiAttackController.java +++ b/forge-gui/src/main/java/forge/ai/AiAttackController.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.List; @@ -24,8 +24,6 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardLists; @@ -33,6 +31,8 @@ import forge.game.card.CounterType; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; import forge.game.player.Player; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/game/ai/AiBlockController.java b/forge-gui/src/main/java/forge/ai/AiBlockController.java similarity index 99% rename from forge-gui/src/main/java/forge/game/ai/AiBlockController.java rename to forge-gui/src/main/java/forge/ai/AiBlockController.java index c460bdb69d6..e75822f17e9 100644 --- a/forge-gui/src/main/java/forge/game/ai/AiBlockController.java +++ b/forge-gui/src/main/java/forge/ai/AiBlockController.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.HashMap; @@ -24,10 +24,8 @@ import java.util.List; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import forge.card.TriggerReplacementBase; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.game.GameEntity; +import forge.game.TriggerReplacementBase; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -35,6 +33,8 @@ import forge.game.card.CounterType; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; import forge.game.player.Player; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; /** diff --git a/forge-gui/src/main/java/forge/game/ai/AiController.java b/forge-gui/src/main/java/forge/ai/AiController.java similarity index 98% rename from forge-gui/src/main/java/forge/game/ai/AiController.java rename to forge-gui/src/main/java/forge/ai/AiController.java index b61ae00c3ef..befcbd779c0 100644 --- a/forge-gui/src/main/java/forge/game/ai/AiController.java +++ b/forge-gui/src/main/java/forge/ai/AiController.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.Arrays; @@ -30,25 +30,26 @@ import com.google.common.collect.Iterables; import forge.card.CardType; import forge.card.MagicColor; -import forge.card.ability.ApiType; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostPart; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellPermanent; import forge.game.GameActionUtil; import forge.game.Game; import forge.game.GameEntity; +import forge.game.ability.ApiType; +import forge.game.ai.AiProps; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostPart; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellPermanent; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.Expressions; @@ -163,7 +164,7 @@ public class AiController { * * @param l * a {@link forge.CardList} object. - * @return an array of {@link forge.card.spellability.SpellAbility} objects. + * @return an array of {@link forge.game.spellability.SpellAbility} objects. */ private ArrayList getSpellAbilities(final List l) { final ArrayList spellAbilities = new ArrayList(); @@ -442,7 +443,7 @@ public class AiController { *

* * @param all - * an array of {@link forge.card.spellability.SpellAbility} + * an array of {@link forge.game.spellability.SpellAbility} * objects. * @return a boolean. */ @@ -552,7 +553,7 @@ public class AiController { * an array of {@link java.lang.String} objects. May be null for * no restrictions. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a List of discarded cards. */ public List getCardsToDiscard(final int numDiscard, final String[] uTypes, final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java b/forge-gui/src/main/java/forge/ai/AiProfileUtil.java similarity index 99% rename from forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java rename to forge-gui/src/main/java/forge/ai/AiProfileUtil.java index 8ce87693012..56a03739085 100644 --- a/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java +++ b/forge-gui/src/main/java/forge/ai/AiProfileUtil.java @@ -15,8 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; +import forge.game.ai.AiProps; import forge.game.player.LobbyPlayer; import forge.game.player.LobbyPlayerAi; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java b/forge-gui/src/main/java/forge/ai/ComputerUtil.java similarity index 98% rename from forge-gui/src/main/java/forge/game/ai/ComputerUtil.java rename to forge-gui/src/main/java/forge/ai/ComputerUtil.java index d6409db45a1..109cc595aec 100644 --- a/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java +++ b/forge-gui/src/main/java/forge/ai/ComputerUtil.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.Collections; @@ -31,26 +31,14 @@ import com.google.common.collect.Iterables; import forge.card.CardType; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.effects.CharmEffect; -import forge.card.cost.Cost; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostPart; -import forge.card.cost.CostPayment; -import forge.card.cost.CostPutCounter; -import forge.card.cost.CostSacrifice; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetRestrictions; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.error.BugReporter; import forge.game.Game; import forge.game.GameObject; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.effects.CharmEffect; +import forge.game.ai.AiProps; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -59,10 +47,23 @@ import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; +import forge.game.cost.Cost; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostPart; +import forge.game.cost.CostPayment; +import forge.game.cost.CostPutCounter; +import forge.game.cost.CostSacrifice; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetRestrictions; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; @@ -86,7 +87,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public static boolean handlePlayingSpellAbility(final Player ai, final SpellAbility sa, final Game game) { @@ -147,7 +148,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a int. */ public static int counterSpellRestriction(final Player ai, final SpellAbility sa) { @@ -218,7 +219,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public static final void playStack(final SpellAbility sa, final Player ai, final Game game) { sa.setActivatingPlayer(ai); @@ -247,7 +248,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public static final void playSpellAbilityForFree(final Player ai, final SpellAbility sa) { sa.setActivatingPlayer(ai); @@ -266,7 +267,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public static final void playSpellAbilityWithoutPayingManaCost(final Player ai, final SpellAbility sa, final Game game) { final SpellAbility newSA = sa.copyWithNoManaCost(); @@ -293,7 +294,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public static final void playNoStack(final Player ai, final SpellAbility sa, final Game game) { sa.setActivatingPlayer(ai); @@ -1045,7 +1046,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean (returns true if it's better to wait until blockers are declared). */ public static boolean waitForBlocking(final SpellAbility sa) { @@ -1066,7 +1067,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean (returns true if it's better to wait until blockers are declared). */ public static boolean castSpellInMain1(final Player ai, final SpellAbility sa) { @@ -1132,7 +1133,7 @@ public class ComputerUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean (returns true if the AI should stop using the ability). */ public static boolean preventRunAwayActivations(final SpellAbility sa) { @@ -1301,7 +1302,7 @@ public class ComputerUtil { * @param saviourAf * a AbilityFactory object * @param topStack - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.util.ArrayList} object. * @since 1.0.15 */ diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java b/forge-gui/src/main/java/forge/ai/ComputerUtilCard.java similarity index 96% rename from forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java rename to forge-gui/src/main/java/forge/ai/ComputerUtilCard.java index da08d6f4466..ef782d7394e 100644 --- a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java +++ b/forge-gui/src/main/java/forge/ai/ComputerUtilCard.java @@ -1,4 +1,4 @@ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.Collection; @@ -21,7 +21,6 @@ import forge.card.CardType; import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -31,6 +30,7 @@ import forge.game.card.CardPredicates; import forge.game.card.CardUtil; import forge.game.combat.Combat; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.item.PaperCard; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java b/forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java similarity index 96% rename from forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java rename to forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java index f55ec0f119e..16839636f02 100644 --- a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java +++ b/forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.HashMap; @@ -24,27 +24,27 @@ import java.util.Map; import com.google.common.base.Predicate; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameEntity; import forge.game.GlobalRuleChange; +import forge.game.TriggerReplacementBase; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; @@ -597,7 +597,7 @@ public class ComputerUtilCombat { * @param defender * a {@link forge.game.card.Card} object. * @param trigger - * a {@link forge.card.trigger.Trigger} object. + * a {@link forge.game.trigger.Trigger} object. * @param combat * a {@link forge.game.combat.Combat} object. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java b/forge-gui/src/main/java/forge/ai/ComputerUtilCost.java similarity index 93% rename from forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java rename to forge-gui/src/main/java/forge/ai/ComputerUtilCost.java index 1e92002e958..c0be6ce791a 100644 --- a/forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java +++ b/forge-gui/src/main/java/forge/ai/ComputerUtilCost.java @@ -1,26 +1,26 @@ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.AbilityUtils; -import forge.card.cost.Cost; -import forge.card.cost.CostDamage; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostPart; -import forge.card.cost.CostPayLife; -import forge.card.cost.CostPayment; -import forge.card.cost.CostPutCounter; -import forge.card.cost.CostRemoveCounter; -import forge.card.cost.CostSacrifice; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; +import forge.game.cost.Cost; +import forge.game.cost.CostDamage; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostPart; +import forge.game.cost.CostPayLife; +import forge.game.cost.CostPayment; +import forge.game.cost.CostPutCounter; +import forge.game.cost.CostRemoveCounter; +import forge.game.cost.CostSacrifice; import forge.game.player.Player; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.TextUtil; @@ -315,7 +315,7 @@ public class ComputerUtilCost { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param player * a {@link forge.game.player.Player} object. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java b/forge-gui/src/main/java/forge/ai/ComputerUtilMana.java similarity index 95% rename from forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java rename to forge-gui/src/main/java/forge/ai/ComputerUtilMana.java index 037e8b49b68..edf275abfe2 100644 --- a/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java +++ b/forge-gui/src/main/java/forge/ai/ComputerUtilMana.java @@ -1,4 +1,4 @@ -package forge.game.ai; +package forge.ai; import java.util.ArrayList; import java.util.Collection; @@ -18,25 +18,25 @@ import com.google.common.collect.Multimap; import forge.FThreads; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; -import forge.card.cost.CostPayment; import forge.card.mana.ManaAtom; import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostShard; -import forge.card.mana.ManaPool; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.GameActionUtil; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; +import forge.game.cost.Cost; +import forge.game.cost.CostPayment; +import forge.game.mana.ManaCostBeingPaid; +import forge.game.mana.ManaPool; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.CollectionSuppliers; import forge.util.maps.EnumMapOfLists; @@ -70,7 +70,7 @@ public class ComputerUtilMana { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param ai * a {@link forge.game.player.Player} object. * @param test @@ -339,9 +339,9 @@ public class ComputerUtilMana { * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param saRoot - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param cost - * a {@link forge.card.mana.ManaCostBeingPaid} object. + * a {@link forge.game.mana.ManaCostBeingPaid} object. * @return String */ private static void getComboManaChoice(final Player ai, final SpellAbility manaAb, final SpellAbility saRoot, final ManaCostBeingPaid cost) { @@ -698,7 +698,7 @@ public class ComputerUtilMana { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param player * a {@link forge.game.player.Player} object. * @return a int. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AddPhaseAi.java b/forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java similarity index 64% rename from forge-gui/src/main/java/forge/card/ability/ai/AddPhaseAi.java rename to forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java index df2a965ac1e..1ef722c2fd8 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AddPhaseAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AddTurnAi.java b/forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/AddTurnAi.java rename to forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java index 2b1b353645c..7b72893e7a6 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AddTurnAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AlwaysPlayAi.java b/forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java similarity index 73% rename from forge-gui/src/main/java/forge/card/ability/ai/AlwaysPlayAi.java rename to forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java index 0c089523a53..fc4fc299559 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AlwaysPlayAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class AlwaysPlayAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java b/forge-gui/src/main/java/forge/ai/ability/AnimateAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java rename to forge-gui/src/main/java/forge/ai/ability/AnimateAi.java index 9de5096a607..e88f36a412c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AnimateAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.collect.Iterables; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardPredicates; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; /** @@ -141,11 +141,11 @@ public class AnimateAi extends SpellAbilityAi { * animateTriggerAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ @@ -172,9 +172,9 @@ public class AnimateAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private boolean animateTgtAI(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AnimateAllAi.java b/forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java similarity index 74% rename from forge-gui/src/main/java/forge/card/ability/ai/AnimateAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java index eeea1e332d0..ae2d21616dc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AnimateAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class AnimateAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java b/forge-gui/src/main/java/forge/ai/ability/AttachAi.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java rename to forge-gui/src/main/java/forge/ai/ability/AttachAi.java index e67b2a80a1b..1efc54c9417 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/AttachAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Collection; @@ -11,30 +11,30 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityAi; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardUtil; import forge.game.combat.CombatUtil; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; import forge.util.MyRandom; public class AttachAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java b/forge-gui/src/main/java/forge/ai/ability/BalanceAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java rename to forge-gui/src/main/java/forge/ai/ability/BalanceAi.java index 5fea8ce6f72..1d8d8f31a52 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/BalanceAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java b/forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java rename to forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java index b15b7fcf388..8692d89e8ce 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCard; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class BecomesBlockedAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/BondAi.java b/forge-gui/src/main/java/forge/ai/ability/BondAi.java similarity index 81% rename from forge-gui/src/main/java/forge/card/ability/ai/BondAi.java rename to forge-gui/src/main/java/forge/ai/ability/BondAi.java index dac508b7f4d..2e56f983889 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/BondAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/BondAi.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collection; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

@@ -39,9 +39,9 @@ public final class BondAi extends SpellAbilityAi { * bondCanPlayAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java b/forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java similarity index 78% rename from forge-gui/src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java rename to forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java index a52a80139c3..2a26237c13e 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java @@ -1,11 +1,11 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class CanPlayAsDrawbackAi extends SpellAbilityAi { @@ -22,11 +22,11 @@ public class CanPlayAsDrawbackAi extends SpellAbilityAi { * copySpellTriggerAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CannotPlayAi.java b/forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java similarity index 82% rename from forge-gui/src/main/java/forge/card/ability/ai/CannotPlayAi.java rename to forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java index 595f731ad12..c1575a030eb 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CannotPlayAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class CannotPlayAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChangeTargetsAi.java b/forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java similarity index 79% rename from forge-gui/src/main/java/forge/card/ability/ai/ChangeTargetsAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java index 76a155001f7..b83eff997bb 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChangeTargetsAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class ChangeTargetsAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java index 37b42f279ce..efa81452042 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Collection; @@ -11,37 +11,37 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import forge.ai.AiBlockController; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.card.CardCharacteristicName; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityAi; -import forge.card.ability.effects.AttachEffect; -import forge.card.cost.Cost; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostPart; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; import forge.game.GlobalRuleChange; -import forge.game.ai.ComputerUtil; -import forge.game.ai.AiBlockController; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityAi; +import forge.game.ability.effects.AttachEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; +import forge.game.cost.Cost; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostPart; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; @@ -53,9 +53,9 @@ public class ChangeZoneAi extends SpellAbilityAi { * changeZoneCanPlayAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ @@ -87,9 +87,9 @@ public class ChangeZoneAi extends SpellAbilityAi { * changeZonePlayDrawbackAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ @@ -113,11 +113,11 @@ public class ChangeZoneAi extends SpellAbilityAi { * changeZoneTriggerAINoCost. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ @@ -153,9 +153,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private static boolean hiddenOriginCanPlayAI(final Player ai, final SpellAbility sa) { @@ -329,9 +329,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private static boolean hiddenOriginPlayDrawbackAI(final Player aiPlayer, final SpellAbility sa) { @@ -359,9 +359,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -545,9 +545,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private static boolean knownOriginCanPlayAI(final Player ai, final SpellAbility sa) { @@ -669,9 +669,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private static boolean knownOriginPlayDrawbackAI(final Player aiPlayer, final SpellAbility sa) { @@ -688,9 +688,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -948,9 +948,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -1057,9 +1057,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -1094,9 +1094,9 @@ public class ChangeZoneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param player * a {@link forge.game.player.Player} object. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java b/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java index 64bc62334d0..08461aa7419 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -159,9 +159,9 @@ public class ChangeZoneAllAi extends SpellAbilityAi { * changeZoneAllPlayDrawbackAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CharmAi.java b/forge-gui/src/main/java/forge/ai/ability/CharmAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/CharmAi.java rename to forge-gui/src/main/java/forge/ai/ability/CharmAi.java index e920792b512..df53837cd10 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CharmAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CharmAi.java @@ -1,14 +1,14 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.ability.effects.CharmEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; +import forge.game.ability.effects.CharmEffect; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.util.Aggregates; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java b/forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java index fb7300a0c77..94585cb8f32 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java @@ -1,22 +1,23 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collection; import java.util.Collections; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; + +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class ChooseCardAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java b/forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java index 01346986759..994a0cfe5a3 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilMana; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ChooseCardNameAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChooseColorAi.java b/forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java similarity index 80% rename from forge-gui/src/main/java/forge/card/ability/ai/ChooseColorAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java index 36cb7770fac..702636a72dc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChooseColorAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.MyRandom; public class ChooseColorAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChoosePlayerAi.java b/forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/ChoosePlayerAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java index 78c78dacb47..550f613bdd6 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChoosePlayerAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java @@ -1,11 +1,11 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class ChoosePlayerAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java b/forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java index ff9491c364a..24005a8e655 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java @@ -1,24 +1,24 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class ChooseSourceAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ChooseTypeAi.java b/forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java similarity index 80% rename from forge-gui/src/main/java/forge/card/ability/ai/ChooseTypeAi.java rename to forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java index e2318ba7a1c..3465dfc9ae2 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ChooseTypeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class ChooseTypeAi extends SpellAbilityAi { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ClashAi.java b/forge-gui/src/main/java/forge/ai/ability/ClashAi.java similarity index 82% rename from forge-gui/src/main/java/forge/card/ability/ai/ClashAi.java rename to forge-gui/src/main/java/forge/ai/ability/ClashAi.java index c2a5d0ed71a..af8a49d63c9 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ClashAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ClashAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ClashAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java b/forge-gui/src/main/java/forge/ai/ability/CloneAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java rename to forge-gui/src/main/java/forge/ai/ability/CloneAi.java index d4c4dd5c23d..1e6f6e9f8f9 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CloneAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class CloneAi extends SpellAbilityAi { @@ -129,9 +129,9 @@ public class CloneAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private boolean cloneTgtAI(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java b/forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java rename to forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java index 5b9dd8b5c72..d3b498afbc6 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java @@ -1,18 +1,18 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Map; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java b/forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java rename to forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java index 7c850b40ea9..a3b755a1531 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Arrays; import java.util.List; @@ -23,17 +23,17 @@ import java.util.Map; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCard; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java b/forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java rename to forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java index 80845afb475..bf615fbd444 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collection; import java.util.List; @@ -7,16 +7,16 @@ import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java b/forge-gui/src/main/java/forge/ai/ability/CounterAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java rename to forge-gui/src/main/java/forge/ai/ability/CounterAi.java index b64f4750659..b9e26802d75 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CounterAi.java @@ -1,16 +1,16 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class CounterAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersAi.java similarity index 98% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersAi.java index 62af228fe9c..fa8cec27099 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersAi.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java index 9713ca74dee..42238f8ecc0 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java index ac06aa2e189..446c9b4e1cb 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java @@ -1,16 +1,16 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class CountersProliferateAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java index c25a873555f..17df9445e73 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; @@ -6,20 +6,20 @@ import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java index 44593430af3..080651f050a 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java @@ -1,24 +1,24 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java index e62de6e3ace..4dfdb3a6761 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java b/forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java rename to forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java index a7347e35a63..81438f0e306 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java @@ -1,15 +1,15 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class CountersRemoveAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java b/forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java rename to forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java index 82171da6380..e179b2c63c5 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardPredicates; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public abstract class DamageAiBase extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java b/forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java index 64614c853c7..ada83af84a0 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; @@ -6,18 +6,18 @@ import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -156,9 +156,9 @@ public class DamageAllAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param player * a {@link forge.game.player.Player} object. * @param dmg diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java b/forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java rename to forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java index c4e90c76cc1..f66e3ad72b7 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; @@ -6,26 +6,26 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetChoices; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetChoices; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; @@ -201,7 +201,7 @@ public class DamageDealAi extends DamageAiBase { *

* * @param saMe - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param dmg * a int. * @return a boolean. @@ -226,9 +226,9 @@ public class DamageDealAi extends DamageAiBase { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param dmg * a int. * @param mandatory @@ -367,7 +367,7 @@ public class DamageDealAi extends DamageAiBase { * @param ai * * @param saMe - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param dmg * a int. * @return a boolean. @@ -422,9 +422,9 @@ public class DamageDealAi extends DamageAiBase { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param dmg * a int. * @param mandatory diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamageEachAi.java b/forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/DamageEachAi.java rename to forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java index d21feb44333..3a4c360a7f0 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamageEachAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class DamageEachAi extends DamageAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java b/forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java rename to forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java index 37d814f332a..c51c817365e 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java @@ -1,26 +1,26 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class DamagePreventAi extends SpellAbilityAi { @@ -172,9 +172,9 @@ public class DamagePreventAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java b/forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java index 48af2ff32e5..bb6e4f58397 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class DamagePreventAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java b/forge-gui/src/main/java/forge/ai/ability/DebuffAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java rename to forge-gui/src/main/java/forge/ai/ability/DebuffAi.java index 6737efe53ba..bc99adc998c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DebuffAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Arrays; @@ -8,21 +8,21 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class DebuffAi extends SpellAbilityAi { @@ -117,9 +117,9 @@ public class DebuffAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param kws * a {@link java.util.ArrayList} object. * @param mandatory @@ -180,9 +180,9 @@ public class DebuffAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param kws * a {@link java.util.ArrayList} object. * @return a {@link forge.CardList} object. @@ -211,9 +211,9 @@ public class DebuffAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java b/forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java index f494ce3c838..299af442b77 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DelayedTriggerAi.java b/forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/DelayedTriggerAi.java rename to forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java index 19c579f13dc..ea8800c2059 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DelayedTriggerAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityFactory; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityFactory; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; public class DelayedTriggerAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java b/forge-gui/src/main/java/forge/ai/ability/DestroyAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java rename to forge-gui/src/main/java/forge/ai/ability/DestroyAi.java index daefc80c815..b8f9ff562cf 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DestroyAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; @@ -6,20 +6,20 @@ import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.cost.CostPart; -import forge.card.cost.CostSacrifice; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; +import forge.game.cost.Cost; +import forge.game.cost.CostPart; +import forge.game.cost.CostSacrifice; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java b/forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java index 485b9e1ceee..01b884953c3 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DigAi.java b/forge-gui/src/main/java/forge/ai/ability/DigAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/DigAi.java rename to forge-gui/src/main/java/forge/ai/ability/DigAi.java index fb0975d4237..11011e8437f 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DigAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DigAi.java @@ -1,15 +1,15 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java b/forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java rename to forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java index 3ce207accb9..74d11f143af 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilMana; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java b/forge-gui/src/main/java/forge/ai/ability/DiscardAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java rename to forge-gui/src/main/java/forge/ai/ability/DiscardAi.java index e791bb3b4bc..256511d71ce 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DiscardAi.java @@ -1,20 +1,20 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java b/forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java rename to forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java index a3ebecc23e0..ce80755099b 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java @@ -1,14 +1,14 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class DrainManaAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java b/forge-gui/src/main/java/forge/ai/ability/DrawAi.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java rename to forge-gui/src/main/java/forge/ai/ability/DrawAi.java index cca0036561f..ce9e66174a3 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/DrawAi.java @@ -16,25 +16,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostPart; -import forge.card.cost.PaymentDecision; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostPart; +import forge.game.cost.PaymentDecision; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class DrawAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java b/forge-gui/src/main/java/forge/ai/ability/EffectAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java rename to forge-gui/src/main/java/forge/ai/ability/EffectAi.java index c6d9f2744a5..e9a7c3e4f5b 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/EffectAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; @@ -6,20 +6,20 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java b/forge-gui/src/main/java/forge/ai/ability/EncodeAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java rename to forge-gui/src/main/java/forge/ai/ability/EncodeAi.java index 4e68ae5f046..c0a80339c32 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/EncodeAi.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collection; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.CombatUtil; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; /** *

@@ -45,9 +45,9 @@ public final class EncodeAi extends SpellAbilityAi { * bondCanPlayAI. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/EndTurnAi.java b/forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java similarity index 81% rename from forge-gui/src/main/java/forge/card/ability/ai/EndTurnAi.java rename to forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java index 1a05c52c882..9e41febac50 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/EndTurnAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/FightAi.java b/forge-gui/src/main/java/forge/ai/ability/FightAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/FightAi.java rename to forge-gui/src/main/java/forge/ai/ability/FightAi.java index 30503d245f1..b70bf7d6ca8 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/FightAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/FightAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.MyRandom; public class FightAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/FlipACoinAi.java b/forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java similarity index 81% rename from forge-gui/src/main/java/forge/card/ability/ai/FlipACoinAi.java rename to forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java index 5e2e2cce48e..289531a2f89 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/FlipACoinAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class FlipACoinAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/FogAi.java b/forge-gui/src/main/java/forge/ai/ability/FogAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/FogAi.java rename to forge-gui/src/main/java/forge/ai/ability/FogAi.java index 39976929714..c8fe28c799d 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/FogAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/FogAi.java @@ -1,12 +1,12 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.SpellAbilityAi; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class FogAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/GameLossAi.java b/forge-gui/src/main/java/forge/ai/ability/GameLossAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/GameLossAi.java rename to forge-gui/src/main/java/forge/ai/ability/GameLossAi.java index 133b5f4898a..89e6ad61b80 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/GameLossAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/GameLossAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class GameLossAi extends SpellAbilityAi { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/ai/GameWinAi.java b/forge-gui/src/main/java/forge/ai/ability/GameWinAi.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/ai/GameWinAi.java rename to forge-gui/src/main/java/forge/ai/ability/GameWinAi.java index 45a7fef94ac..d9ee886b7b9 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/GameWinAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/GameWinAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class GameWinAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java b/forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java rename to forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java index 84d8aa000c1..c7de1365e26 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collection; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/LifeExchangeAi.java b/forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/LifeExchangeAi.java rename to forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java index 4c6f2acd2e2..6dbd2e24683 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/LifeExchangeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java @@ -1,11 +1,11 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class LifeExchangeAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java b/forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java rename to forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java index f46d525992b..47143c909a8 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; /** * TODO: Write javadoc for this type. @@ -130,11 +130,11 @@ public class LifeGainAi extends SpellAbilityAi { * gainLifeDoTriggerAINoCost. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java b/forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java rename to forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java index 2502407c6e2..eb54d575411 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java @@ -1,17 +1,18 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; + +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class LifeLoseAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java b/forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java rename to forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java index 21878785852..3f8d56265fc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java @@ -1,16 +1,16 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class LifeSetAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ManaEffectAi.java b/forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java similarity index 67% rename from forge-gui/src/main/java/forge/card/ability/ai/ManaEffectAi.java rename to forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java index f9e6968a7be..6e2a04a782c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ManaEffectAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java @@ -1,11 +1,11 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.SpellAbilityAi; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class ManaEffectAi extends SpellAbilityAi { @@ -19,11 +19,11 @@ public class ManaEffectAi extends SpellAbilityAi { /** * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/MillAi.java b/forge-gui/src/main/java/forge/ai/ability/MillAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/MillAi.java rename to forge-gui/src/main/java/forge/ai/ability/MillAi.java index 2bef54bb163..9f4f63a5c9c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/MillAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/MillAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class MillAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/MustAttackAi.java b/forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/MustAttackAi.java rename to forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java index 50f6b2de7fa..d18c8af1386 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/MustAttackAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class MustAttackAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java b/forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java rename to forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java index e94be47eace..bfda33b2341 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java @@ -1,21 +1,21 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class MustBlockAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PeekAndRevealAi.java b/forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/ai/PeekAndRevealAi.java rename to forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java index a6ada4cb287..bf3a8334e6c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PeekAndRevealAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java b/forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java rename to forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java index f2546878f78..7f5d8fdea5b 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java @@ -1,18 +1,18 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardPredicates; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java b/forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java similarity index 82% rename from forge-gui/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java rename to forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java index 393101fefe6..311d34b24ef 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.SpellAbilityAi; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * AbilityFactory for Creature Spells. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java b/forge-gui/src/main/java/forge/ai/ability/PhasesAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java rename to forge-gui/src/main/java/forge/ai/ability/PhasesAi.java index 7376cb5938b..7e72ea707fa 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PhasesAi.java @@ -1,16 +1,16 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -89,11 +89,11 @@ public class PhasesAi extends SpellAbilityAi { *

* * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -126,9 +126,9 @@ public class PhasesAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java b/forge-gui/src/main/java/forge/ai/ability/PlayAi.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java rename to forge-gui/src/main/java/forge/ai/ability/PlayAi.java index d78048a6ae3..5bb58ea9d1c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PlayAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Collection; @@ -7,18 +7,18 @@ import java.util.Random; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -81,11 +81,11 @@ public class PlayAi extends SpellAbilityAi { * doTriggerAINoCost *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java b/forge-gui/src/main/java/forge/ai/ability/PoisonAi.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java rename to forge-gui/src/main/java/forge/ai/ability/PoisonAi.java index ab3af9e2743..244f2c4de8c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PoisonAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class PoisonAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java b/forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java rename to forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java index c423b4365fe..8dff19b8be2 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Collections; import java.util.List; @@ -6,14 +6,14 @@ import java.util.Map; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java b/forge-gui/src/main/java/forge/ai/ability/ProtectAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java rename to forge-gui/src/main/java/forge/ai/ability/ProtectAi.java index fa238063425..2aa3766fa94 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ProtectAi.java @@ -1,27 +1,27 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; import com.google.common.base.Predicate; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.ability.effects.ProtectEffect; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; +import forge.game.ability.effects.ProtectEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class ProtectAi extends SpellAbilityAi { @@ -62,7 +62,7 @@ public class ProtectAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @return a {@link forge.CardList} object. */ private static List getProtectCreatures(final Player ai, final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java b/forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java similarity index 83% rename from forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java index 777a8749fd7..7f93af07edc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java @@ -1,12 +1,12 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class ProtectAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java b/forge-gui/src/main/java/forge/ai/ability/PumpAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java rename to forge-gui/src/main/java/forge/ai/ability/PumpAi.java index 57a799cca92..932eca185cb 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PumpAi.java @@ -1,29 +1,29 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.cost.CostPart; -import forge.card.cost.CostTapType; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; +import forge.game.cost.Cost; +import forge.game.cost.CostPart; +import forge.game.cost.CostTapType; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class PumpAi extends PumpAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java b/forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java rename to forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java index eba036ab5da..31e81ffb177 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java +++ b/forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,11 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -23,6 +22,7 @@ import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.phase.Untap; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public abstract class PumpAiBase extends SpellAbilityAi { @@ -502,7 +502,7 @@ public abstract class PumpAiBase extends SpellAbilityAi { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param defense * a int. * @param attack diff --git a/forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java b/forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java index e134115d794..51de40ab410 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.Arrays; @@ -6,19 +6,19 @@ import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class PumpAllAi extends PumpAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RearrangeTopOfLibraryAi.java b/forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/ai/RearrangeTopOfLibraryAi.java rename to forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java index d0728092079..98e16910b3d 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RearrangeTopOfLibraryAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class RearrangeTopOfLibraryAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java b/forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java rename to forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java index 35d3da24582..263a4ecac22 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java @@ -15,28 +15,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java b/forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java index 96ca4f81a25..b0634b3168a 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java @@ -1,21 +1,21 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class RegenerateAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RemoveFromCombatAi.java b/forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/RemoveFromCombatAi.java rename to forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java index 112a9cd5b39..a4a47447816 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RemoveFromCombatAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class RemoveFromCombatAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RepeatAi.java b/forge-gui/src/main/java/forge/ai/ability/RepeatAi.java similarity index 81% rename from forge-gui/src/main/java/forge/card/ability/ai/RepeatAi.java rename to forge-gui/src/main/java/forge/ai/ability/RepeatAi.java index b4b1942d953..e0b3c2495f1 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RepeatAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RepeatAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.AbilityFactory; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityFactory; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class RepeatAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java b/forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java rename to forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java index dc5f591be34..80b4ac514c2 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RestartGameAi.java b/forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/ai/RestartGameAi.java rename to forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java index 53e8653669d..2bbd7fd2b36 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RestartGameAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class RestartGameAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java b/forge-gui/src/main/java/forge/ai/ability/RevealAi.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java rename to forge-gui/src/main/java/forge/ai/ability/RevealAi.java index 74fd1a903ff..73062d54fbf 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RevealAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.MyRandom; public class RevealAi extends RevealAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RevealAiBase.java b/forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/ai/RevealAiBase.java rename to forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java index 2305c6191ea..3fd07870b43 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RevealAiBase.java +++ b/forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java @@ -1,10 +1,10 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public abstract class RevealAiBase extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java b/forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java rename to forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java index 6ba8a936cae..58827e4dfd2 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCost; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.MyRandom; public class RevealHandAi extends RevealAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java b/forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java rename to forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java index b64a729fe94..ab11cda3ada 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java @@ -1,14 +1,14 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.AiController; +import forge.ai.AiController; +import forge.game.ability.SpellAbilityAi; import forge.game.ai.AiProps; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java b/forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java rename to forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java index 1a73ed74a98..81b65edf2ad 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class SacrificeAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java b/forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java index c50a6cd0cc5..43acb772357 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java @@ -1,17 +1,17 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ScryAi.java b/forge-gui/src/main/java/forge/ai/ability/ScryAi.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/ai/ScryAi.java rename to forge-gui/src/main/java/forge/ai/ability/ScryAi.java index 9e1da576fbe..8f808983664 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ScryAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ScryAi.java @@ -1,11 +1,11 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class ScryAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/SetStateAi.java b/forge-gui/src/main/java/forge/ai/ability/SetStateAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/SetStateAi.java rename to forge-gui/src/main/java/forge/ai/ability/SetStateAi.java index 890f92c5d88..08d59b4472f 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/SetStateAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/SetStateAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class SetStateAi extends SpellAbilityAi { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ShuffleAi.java b/forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/ShuffleAi.java rename to forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java index 06737476cf5..0c426ee3ccc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ShuffleAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java @@ -1,9 +1,9 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; public class ShuffleAi extends SpellAbilityAi { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java b/forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java rename to forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java index 168ff48500e..0d756d606c9 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java @@ -1,14 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilMana; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; @@ -17,6 +16,7 @@ import forge.game.combat.CombatUtil; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class StoreSVarAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TapAi.java b/forge-gui/src/main/java/forge/ai/ability/TapAi.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/ai/TapAi.java rename to forge-gui/src/main/java/forge/ai/ability/TapAi.java index 4ca4874861b..3611aea2d34 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TapAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TapAi.java @@ -1,16 +1,16 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; +import forge.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class TapAi extends TapAiBase { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java b/forge-gui/src/main/java/forge/ai/ability/TapAiBase.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java rename to forge-gui/src/main/java/forge/ai/ability/TapAiBase.java index d9d413bc677..c9323633e30 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java +++ b/forge-gui/src/main/java/forge/ai/ability/TapAiBase.java @@ -1,16 +1,14 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -19,6 +17,8 @@ import forge.game.combat.CombatUtil; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public abstract class TapAiBase extends SpellAbilityAi { @@ -29,9 +29,9 @@ public abstract class TapAiBase extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param tapList * a {@link forge.CardList} object. * @param mandatory @@ -103,11 +103,11 @@ public abstract class TapAiBase extends SpellAbilityAi { * @param source * a {@link forge.game.card.Card} object. * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -231,9 +231,9 @@ public abstract class TapAiBase extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java b/forge-gui/src/main/java/forge/ai/ability/TapAllAi.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/TapAllAi.java index 19ff5794e6f..86b1f849cba 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TapAllAi.java @@ -1,4 +1,4 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; @@ -6,16 +6,16 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.combat.CombatUtil; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java b/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java rename to forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java index 6727d3debde..7fe5ae78d06 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class TapOrUntapAi extends TapAiBase { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAllAi.java b/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java similarity index 79% rename from forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java index 228b36cc0ab..ee1867e6eb9 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java @@ -1,8 +1,8 @@ -package forge.card.ability.ai; +package forge.ai.ability; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java b/forge-gui/src/main/java/forge/ai/ability/TokenAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java rename to forge-gui/src/main/java/forge/ai/ability/TokenAi.java index dfb2b8e92b1..52d604272bc 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TokenAi.java @@ -1,21 +1,21 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.game.Game; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -42,7 +42,7 @@ public class TokenAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. */ private void readParameters(final SpellAbility mapParams) { String[] keywords; diff --git a/forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java b/forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java rename to forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java index f6f2cc00281..9e02224fb1b 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java @@ -1,15 +1,15 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class TwoPilesAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java b/forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java index 51321fb08f0..fb13e8449c0 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java @@ -1,20 +1,20 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilMana; import forge.game.GameObject; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; public class UnattachAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java b/forge-gui/src/main/java/forge/ai/ability/UntapAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java rename to forge-gui/src/main/java/forge/ai/ability/UntapAi.java index 82274f5a1ac..f391c2f8f90 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/UntapAi.java @@ -1,19 +1,19 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.cost.Cost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -104,11 +104,11 @@ public class UntapAi extends SpellAbilityAi { *

* * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -182,9 +182,9 @@ public class UntapAi extends SpellAbilityAi { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @return a boolean. @@ -232,11 +232,11 @@ public class UntapAi extends SpellAbilityAi { * @param source * a {@link forge.game.card.Card} object. * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mandatory * a boolean. * @param tapList diff --git a/forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java b/forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java similarity index 82% rename from forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java rename to forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java index bc42a468b45..6b38cb1079c 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java @@ -1,13 +1,13 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.List; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class UntapAllAi extends SpellAbilityAi { diff --git a/forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java b/forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java rename to forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java index 877f049d681..4e9dd3b2fa3 100644 --- a/forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java +++ b/forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java @@ -1,14 +1,15 @@ -package forge.card.ability.ai; +package forge.ai.ability; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityAi; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; + +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/card/CardCharacteristics.java b/forge-gui/src/main/java/forge/card/CardCharacteristics.java index 98c6c86e10f..2d5e959f36f 100644 --- a/forge-gui/src/main/java/forge/card/CardCharacteristics.java +++ b/forge-gui/src/main/java/forge/card/CardCharacteristics.java @@ -26,11 +26,11 @@ import java.util.concurrent.CopyOnWriteArrayList; import com.google.common.collect.Lists; import forge.card.mana.ManaCost; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; import forge.game.card.CardColor; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/package-info.java b/forge-gui/src/main/java/forge/card/ability/package-info.java deleted file mode 100644 index 9605e128641..00000000000 --- a/forge-gui/src/main/java/forge/card/ability/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.ability; - diff --git a/forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java b/forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java index 1c1f0371ef2..247003a42ff 100644 --- a/forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java +++ b/forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java @@ -28,26 +28,26 @@ import forge.card.CardCharacteristics; import forge.card.CardRules; import forge.card.CardSplitType; import forge.card.ICardFace; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.effects.CharmEffect; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellPermanent; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; -import forge.card.trigger.WrappedAbility; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.effects.CharmEffect; import forge.game.card.Card; import forge.game.card.CardColor; import forge.game.card.CardUtil; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellPermanent; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; +import forge.game.trigger.WrappedAbility; import forge.item.PaperCard; import forge.item.IPaperCard; @@ -166,7 +166,7 @@ public class CardFactory { * @param original * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param bCopyDetails * a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index 045a07cb2d6..0aa9d59a2bc 100644 --- a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -20,15 +20,15 @@ package forge.card.cardfactory; import java.util.ArrayList; import java.util.List; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.AbilityStatic; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.AbilityStatic; +import forge.game.spellability.SpellAbility; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 05c2afe7fcc..efbd7d751eb 100644 --- a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -27,47 +27,47 @@ import com.google.common.collect.Lists; import forge.Command; import forge.Singletons; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; import forge.card.CardCharacteristicName; import forge.card.CardType; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostParser; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.replacement.ReplacementLayer; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.AbilityStatic; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; -import forge.card.spellability.SpellPermanent; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameLogEntryType; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardUtil; import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; +import forge.game.cost.Cost; import forge.game.event.GameEventCardStatsChanged; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.replacement.ReplacementLayer; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.AbilityStatic; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.SpellPermanent; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; @@ -95,7 +95,7 @@ public class CardFactoryUtil { * a {@link forge.game.card.Card} object. * @param manaCost * a {@link java.lang.String} object. - * @return a {@link forge.card.spellability.AbilityActivated} object. + * @return a {@link forge.game.spellability.AbilityActivated} object. */ public static AbilityActivated abilityUnearth(final Card sourceCard, final String manaCost) { @@ -158,7 +158,7 @@ public class CardFactoryUtil { * * @param sourceCard * a {@link forge.game.card.Card} object. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static SpellAbility abilityMorphDown(final Card sourceCard) { final Spell morphDown = new Spell(sourceCard, new Cost(ManaCost.THREE, false)) { @@ -198,8 +198,8 @@ public class CardFactoryUtil { * @param sourceCard * a {@link forge.game.card.Card} object. * @param cost - * a {@link forge.card.cost.Cost} object. - * @return a {@link forge.card.spellability.AbilityActivated} object. + * a {@link forge.game.cost.Cost} object. + * @return a {@link forge.game.spellability.AbilityActivated} object. */ public static AbilityStatic abilityMorphUp(final Card sourceCard, final Cost cost) { final AbilityStatic morphUp = new AbilityStatic(sourceCard, cost, null) { @@ -249,7 +249,7 @@ public class CardFactoryUtil { * a {@link forge.game.card.Card} object. * @param cycleCost * a {@link java.lang.String} object. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static SpellAbility abilityCycle(final Card sourceCard, String cycleCost) { StringBuilder sb = new StringBuilder(); @@ -275,7 +275,7 @@ public class CardFactoryUtil { * a {@link java.lang.String} object. * @param type * a {@link java.lang.String} object. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static SpellAbility abilityTypecycle(final Card sourceCard, String cycleCost, final String type) { StringBuilder sb = new StringBuilder(); @@ -307,7 +307,7 @@ public class CardFactoryUtil { * a {@link forge.game.card.Card} object. * @param transmuteCost * a {@link java.lang.String} object. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static SpellAbility abilityTransmute(final Card sourceCard, String transmuteCost) { transmuteCost += " Discard<1/CARDNAME>"; @@ -397,7 +397,7 @@ public class CardFactoryUtil { * a {@link java.lang.String} object. * @param timeCounters * a int. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static SpellAbility abilitySuspendStatic(final Card sourceCard, final String suspendCost, final String timeCounters) { // be careful with Suspend ability, it will not hit the stack @@ -614,7 +614,7 @@ public class CardFactoryUtil { *

* * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param target * a {@link forge.game.card.Card} object. * @return a boolean. @@ -2059,7 +2059,7 @@ public class CardFactoryUtil { *

* * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a int. */ public static int getNeededXDamage(final SpellAbility ability) { @@ -2853,7 +2853,7 @@ public class CardFactoryUtil { sbDies.append("ValidCard$ Creature.HauntedBy | Execute$ ").append(hauntSVarName); sbDies.append(" | TriggerDescription$ ").append(hauntDescription); - final Trigger hauntedDies = forge.card.trigger.TriggerHandler.parseTrigger(sbDies.toString(), card, true); + final Trigger hauntedDies = forge.game.trigger.TriggerHandler.parseTrigger(sbDies.toString(), card, true); // Third, create the trigger that runs when the haunting creature // enters the battlefield @@ -2862,7 +2862,7 @@ public class CardFactoryUtil { sbETB.append(hauntSVarName).append(" | Secondary$ True | TriggerDescription$ "); sbETB.append(hauntDescription); - final Trigger haunterETB = forge.card.trigger.TriggerHandler.parseTrigger(sbETB.toString(), card, true); + final Trigger haunterETB = forge.game.trigger.TriggerHandler.parseTrigger(sbETB.toString(), card, true); // Fourth, create a trigger that removes the haunting status if the // haunter leaves the exile @@ -2871,7 +2871,7 @@ public class CardFactoryUtil { sbUnExiled.append("ValidCard$ Card.Self | Static$ True | Secondary$ True | "); sbUnExiled.append("TriggerDescription$ Blank"); - final Trigger haunterUnExiled = forge.card.trigger.TriggerHandler.parseTrigger(sbUnExiled.toString(), card, + final Trigger haunterUnExiled = forge.game.trigger.TriggerHandler.parseTrigger(sbUnExiled.toString(), card, true); final Ability haunterUnExiledWork = new Ability(card, ManaCost.ZERO) { diff --git a/forge-gui/src/main/java/forge/card/replacement/package-info.java b/forge-gui/src/main/java/forge/card/replacement/package-info.java deleted file mode 100644 index 10fbfe31781..00000000000 --- a/forge-gui/src/main/java/forge/card/replacement/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.replacement; - diff --git a/forge-gui/src/main/java/forge/card/spellability/package-info.java b/forge-gui/src/main/java/forge/card/spellability/package-info.java deleted file mode 100644 index 9a58fed5624..00000000000 --- a/forge-gui/src/main/java/forge/card/spellability/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.spellability; - diff --git a/forge-gui/src/main/java/forge/card/staticability/package-info.java b/forge-gui/src/main/java/forge/card/staticability/package-info.java deleted file mode 100644 index 60a8a37019e..00000000000 --- a/forge-gui/src/main/java/forge/card/staticability/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.staticability; - diff --git a/forge-gui/src/main/java/forge/card/trigger/package-info.java b/forge-gui/src/main/java/forge/card/trigger/package-info.java deleted file mode 100644 index c2ec4430023..00000000000 --- a/forge-gui/src/main/java/forge/card/trigger/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.card.trigger; - diff --git a/forge-gui/src/main/java/forge/game/Game.java b/forge-gui/src/main/java/forge/game/Game.java index b1242739c19..5d661df2008 100644 --- a/forge-gui/src/main/java/forge/game/Game.java +++ b/forge-gui/src/main/java/forge/game/Game.java @@ -26,10 +26,6 @@ import java.util.TreeMap; import com.google.common.eventbus.EventBus; import forge.FThreads; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.trigger.TriggerHandler; -import forge.card.trigger.TriggerType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; @@ -43,6 +39,10 @@ import forge.game.phase.Untap; import forge.game.phase.Upkeep; import forge.game.player.Player; import forge.game.player.RegisteredPlayer; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.trigger.TriggerHandler; +import forge.game.trigger.TriggerType; import forge.game.zone.MagicStack; import forge.game.zone.Zone; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/game/GameAction.java b/forge-gui/src/main/java/forge/game/GameAction.java index f4324499e97..19e3afb63f2 100644 --- a/forge-gui/src/main/java/forge/game/GameAction.java +++ b/forge-gui/src/main/java/forge/game/GameAction.java @@ -37,20 +37,11 @@ import forge.Command; import forge.FThreads; import forge.card.CardCharacteristicName; import forge.card.CardType; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityFactory; -import forge.card.ability.ApiType; -import forge.card.ability.effects.AttachEffect; import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.replacement.ReplacementResult; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; -import forge.card.trigger.ZCTrigger; +import forge.game.ability.AbilityFactory; +import forge.game.ability.ApiType; +import forge.game.ability.effects.AttachEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -66,6 +57,14 @@ import forge.game.event.GameEventFlipCoin; import forge.game.event.GameEventGameStarted; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.game.replacement.ReplacementResult; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; +import forge.game.trigger.ZCTrigger; import forge.game.zone.PlayerZone; import forge.game.zone.PlayerZoneBattlefield; import forge.game.zone.Zone; diff --git a/forge-gui/src/main/java/forge/game/GameActionUtil.java b/forge-gui/src/main/java/forge/game/GameActionUtil.java index 3440f39e60e..697de450802 100644 --- a/forge-gui/src/main/java/forge/game/GameActionUtil.java +++ b/forge-gui/src/main/java/forge/game/GameActionUtil.java @@ -30,22 +30,22 @@ import com.google.common.collect.Lists; import forge.Command; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityFactory.AbilityRecordType; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.AbilityFactory.AbilityRecordType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; +import forge.game.cost.Cost; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; import forge.game.zone.ZoneType; import forge.util.TextUtil; @@ -569,7 +569,7 @@ public final class GameActionUtil { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. */ public static String generatedMana(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/game/GameLogFormatter.java b/forge-gui/src/main/java/forge/game/GameLogFormatter.java index 13e4ae22ac6..f48cb7beb7f 100644 --- a/forge-gui/src/main/java/forge/game/GameLogFormatter.java +++ b/forge-gui/src/main/java/forge/game/GameLogFormatter.java @@ -6,7 +6,6 @@ import java.util.Map.Entry; import com.google.common.eventbus.Subscribe; -import forge.card.spellability.TargetChoices; import forge.game.card.Card; import forge.game.event.GameEvent; import forge.game.event.GameEventAttackersDeclared; @@ -26,6 +25,7 @@ import forge.game.event.GameEventTurnPhase; import forge.game.event.IGameEventVisitor; import forge.game.player.LobbyPlayer; import forge.game.player.Player; +import forge.game.spellability.TargetChoices; import forge.game.zone.ZoneType; import forge.util.Lang; import forge.util.maps.MapOfLists; diff --git a/forge-gui/src/main/java/forge/game/GameNew.java b/forge-gui/src/main/java/forge/game/GameNew.java index 91dac122832..d617fabfc18 100644 --- a/forge-gui/src/main/java/forge/game/GameNew.java +++ b/forge-gui/src/main/java/forge/game/GameNew.java @@ -16,10 +16,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.Singletons; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -29,6 +25,10 @@ import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.PlayerType; import forge.game.player.RegisteredPlayer; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; diff --git a/forge-gui/src/main/java/forge/game/GameObject.java b/forge-gui/src/main/java/forge/game/GameObject.java index 24fcce20865..4a97ab6f352 100644 --- a/forge-gui/src/main/java/forge/game/GameObject.java +++ b/forge-gui/src/main/java/forge/game/GameObject.java @@ -1,8 +1,8 @@ package forge.game; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public abstract class GameObject { diff --git a/forge-gui/src/main/java/forge/game/PlanarDice.java b/forge-gui/src/main/java/forge/game/PlanarDice.java index 11036486d47..42fd4a0c43a 100644 --- a/forge-gui/src/main/java/forge/game/PlanarDice.java +++ b/forge-gui/src/main/java/forge/game/PlanarDice.java @@ -2,8 +2,8 @@ package forge.game; import java.util.HashMap; -import forge.card.trigger.TriggerType; import forge.game.player.Player; +import forge.game.trigger.TriggerType; /** * Represents the planar dice for Planechase games. diff --git a/forge-gui/src/main/java/forge/game/StaticEffect.java b/forge-gui/src/main/java/forge/game/StaticEffect.java index fcc0931c7f3..786ce288e1b 100644 --- a/forge-gui/src/main/java/forge/game/StaticEffect.java +++ b/forge-gui/src/main/java/forge/game/StaticEffect.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

@@ -125,7 +125,7 @@ public class StaticEffect { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void addOriginalAbilities(final Card c, final SpellAbility sa) { if (!this.originalAbilities.containsKey(c)) { diff --git a/forge-gui/src/main/java/forge/game/StaticEffects.java b/forge-gui/src/main/java/forge/game/StaticEffects.java index 043a2d052c8..b03e81eb6a2 100644 --- a/forge-gui/src/main/java/forge/game/StaticEffects.java +++ b/forge-gui/src/main/java/forge/game/StaticEffects.java @@ -27,12 +27,11 @@ import java.util.Set; import com.esotericsoftware.minlog.Log; -import forge.card.TriggerReplacementBase; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/TriggerReplacementBase.java b/forge-gui/src/main/java/forge/game/TriggerReplacementBase.java similarity index 96% rename from forge-gui/src/main/java/forge/card/TriggerReplacementBase.java rename to forge-gui/src/main/java/forge/game/TriggerReplacementBase.java index 0be53536b0e..75a22e65c45 100644 --- a/forge-gui/src/main/java/forge/card/TriggerReplacementBase.java +++ b/forge-gui/src/main/java/forge/game/TriggerReplacementBase.java @@ -1,19 +1,18 @@ -package forge.card; +package forge.game; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Map; -import forge.card.ability.AbilityUtils; +import forge.card.MagicColor; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.game.Game; -import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Expressions; diff --git a/forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java b/forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java similarity index 80% rename from forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java rename to forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java index be25231a7e7..4d16c153013 100644 --- a/forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java +++ b/forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java @@ -1,18 +1,18 @@ -package forge.card.ability; +package forge.game.ability; import java.util.Map; -import forge.card.ability.effects.ChangeZoneAllEffect; -import forge.card.ability.effects.ChangeZoneEffect; -import forge.card.ability.effects.ManaEffect; -import forge.card.ability.effects.ManaReflectedEffect; import forge.card.cardfactory.CardFactory; -import forge.card.cost.Cost; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.effects.ChangeZoneAllEffect; +import forge.game.ability.effects.ChangeZoneEffect; +import forge.game.ability.effects.ManaEffect; +import forge.game.ability.effects.ManaReflectedEffect; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.TargetRestrictions; public class AbilityApiBased extends AbilityActivated { private final SpellAbilityEffect effect; diff --git a/forge-gui/src/main/java/forge/card/ability/AbilityFactory.java b/forge-gui/src/main/java/forge/game/ability/AbilityFactory.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/AbilityFactory.java rename to forge-gui/src/main/java/forge/game/ability/AbilityFactory.java index da0461f0bad..3e4b970f771 100644 --- a/forge-gui/src/main/java/forge/card/ability/AbilityFactory.java +++ b/forge-gui/src/main/java/forge/game/ability/AbilityFactory.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability; +package forge.game.ability; import java.util.ArrayList; import java.util.List; import java.util.Map; import forge.card.CardCharacteristicName; -import forge.card.cost.Cost; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityCondition; -import forge.card.spellability.SpellAbilityRestriction; -import forge.card.spellability.TargetRestrictions; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityCondition; +import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.FileSection; @@ -89,7 +89,7 @@ public final class AbilityFactory { * a {@link java.lang.String} object. * @param hostCard * a {@link forge.game.card.Card} object. - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public static final SpellAbility getAbility(final String abString, final Card hostCard) { @@ -267,7 +267,7 @@ public final class AbilityFactory { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mapParams */ private static final void makeRestrictions(final SpellAbility sa, Map mapParams) { @@ -285,7 +285,7 @@ public final class AbilityFactory { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param mapParams */ private static final void makeConditions(final SpellAbility sa, Map mapParams) { @@ -304,7 +304,7 @@ public final class AbilityFactory { *

* @param sSub * - * @return a {@link forge.card.spellability.AbilitySub} object. + * @return a {@link forge.game.spellability.AbilitySub} object. */ private static final AbilitySub getSubAbility(Card hostCard, String sSub) { diff --git a/forge-gui/src/main/java/forge/card/ability/AbilityUtils.java b/forge-gui/src/main/java/forge/game/ability/AbilityUtils.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/AbilityUtils.java rename to forge-gui/src/main/java/forge/game/ability/AbilityUtils.java index 4149e24b2be..a68cbb1116d 100644 --- a/forge-gui/src/main/java/forge/card/ability/AbilityUtils.java +++ b/forge-gui/src/main/java/forge/game/ability/AbilityUtils.java @@ -1,9 +1,11 @@ -package forge.card.ability; +package forge.game.ability; import java.util.ArrayList; import java.util.List; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; import forge.card.MagicColor; import forge.card.mana.ManaCostShard; import org.apache.commons.lang3.StringUtils; @@ -11,23 +13,21 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Iterables; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilityStatic; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.card.CounterType; +import forge.game.cost.Cost; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.HumanPlay; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilityStatic; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; import forge.game.zone.ZoneType; import forge.util.Expressions; @@ -74,7 +74,7 @@ public class AbilityUtils { * @param def * a {@link java.lang.String} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.util.ArrayList} object. */ @SuppressWarnings("unchecked") @@ -291,7 +291,7 @@ public class AbilityUtils { * @param amount * a {@link java.lang.String} object. * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a int. */ public static int calculateAmount(final Card card, String amount, final SpellAbility ability) { @@ -600,7 +600,7 @@ public class AbilityUtils { * @param def * a {@link java.lang.String} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.util.ArrayList} object. */ public static List getDefinedObjects(final Card card, final String def, final SpellAbility sa) { @@ -722,7 +722,7 @@ public class AbilityUtils { * @param def * a {@link java.lang.String} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.util.ArrayList} object. */ public static List getDefinedPlayers(final Card card, final String def, final SpellAbility sa) { @@ -1006,7 +1006,7 @@ public class AbilityUtils { * @param def * a {@link java.lang.String} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.util.ArrayList} object. */ public static ArrayList getDefinedSpellAbilities(final Card card, final String def, diff --git a/forge-gui/src/main/java/forge/card/ability/ApiType.java b/forge-gui/src/main/java/forge/game/ability/ApiType.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/ApiType.java rename to forge-gui/src/main/java/forge/game/ability/ApiType.java index 707ccf1bfdf..dad7f3c8e77 100644 --- a/forge-gui/src/main/java/forge/card/ability/ApiType.java +++ b/forge-gui/src/main/java/forge/game/ability/ApiType.java @@ -1,11 +1,11 @@ -package forge.card.ability; +package forge.game.ability; import java.util.Map; import java.util.TreeMap; -import forge.card.ability.ai.*; -import forge.card.ability.effects.*; +import forge.ai.ability.*; +import forge.game.ability.effects.*; import forge.util.ReflectionUtil; /** diff --git a/forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java b/forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java rename to forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java index d64b47927aa..3723e6987d5 100644 --- a/forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java +++ b/forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java @@ -1,13 +1,13 @@ -package forge.card.ability; +package forge.game.ability; import java.util.List; import com.google.common.collect.Lists; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; // Class contains all that methods that are used by both effects and AI to fetch their targets. // {SA}Effect and {SA}Ai now inherit from this class to use these routines, though they should not. diff --git a/forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java b/forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java rename to forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java index ec5cbce5bc4..eb0aa4f43de 100644 --- a/forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java +++ b/forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java @@ -1,4 +1,4 @@ -package forge.card.ability; +package forge.game.ability; import java.util.Collection; @@ -6,16 +6,16 @@ import java.util.List; import com.google.common.collect.Iterables; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; import forge.game.card.Card; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public abstract class SpellAbilityAi extends SaTargetRoutines { @@ -83,7 +83,7 @@ public abstract class SpellAbilityAi extends SaTargetRoutines { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ protected static boolean isSorcerySpeed(final SpellAbility sa) { @@ -97,7 +97,7 @@ public abstract class SpellAbilityAi extends SaTargetRoutines { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ protected static boolean playReusable(final Player ai, final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/ability/SpellAbilityEffect.java b/forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/SpellAbilityEffect.java rename to forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java index 9b2255d17a8..f0bc3b8116d 100644 --- a/forge-gui/src/main/java/forge/card/ability/SpellAbilityEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability; +package forge.game.ability; import java.util.List; import java.util.Map; @@ -8,8 +8,8 @@ import org.apache.commons.lang3.StringUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/ability/SpellApiBased.java b/forge-gui/src/main/java/forge/game/ability/SpellApiBased.java similarity index 79% rename from forge-gui/src/main/java/forge/card/ability/SpellApiBased.java rename to forge-gui/src/main/java/forge/game/ability/SpellApiBased.java index f03edb7c430..f6991e57655 100644 --- a/forge-gui/src/main/java/forge/card/ability/SpellApiBased.java +++ b/forge-gui/src/main/java/forge/game/ability/SpellApiBased.java @@ -1,16 +1,16 @@ -package forge.card.ability; +package forge.game.ability; import java.util.Map; -import forge.card.ability.effects.ChangeZoneAllEffect; -import forge.card.ability.effects.ChangeZoneEffect; -import forge.card.ability.effects.ManaEffect; -import forge.card.ability.effects.ManaReflectedEffect; -import forge.card.cost.Cost; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.Spell; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.effects.ChangeZoneAllEffect; +import forge.game.ability.effects.ChangeZoneEffect; +import forge.game.ability.effects.ManaEffect; +import forge.game.ability.effects.ManaReflectedEffect; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.Spell; +import forge.game.spellability.TargetRestrictions; public class SpellApiBased extends Spell { private static final long serialVersionUID = -6741797239508483250L; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java similarity index 80% rename from forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java index fbaafb744df..df091f1b4d3 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; public class AbandonEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AddPhaseEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/AddPhaseEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java index 8f9fcb39348..9c35d137a92 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AddPhaseEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java @@ -1,9 +1,9 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AddTurnEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/effects/AddTurnEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java index 626abce6848..0fd717b2675 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AddTurnEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.phase.ExtraTurn; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; public class AddTurnEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java index a48bc155904..421d5c0717b 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,20 +6,20 @@ import java.util.List; import java.util.Map; import forge.Command; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; +import forge.game.TriggerReplacementBase; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; public class AnimateAllEffect extends AnimateEffectBase { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java index 95de3b6ed69..743df9e7b88 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,19 +6,19 @@ import java.util.List; import java.util.Map; import forge.Command; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; +import forge.game.TriggerReplacementBase; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.event.GameEventCardStatsChanged; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; public class AnimateEffect extends AnimateEffectBase { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java b/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java rename to forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java index 7975e6b28f2..f4918d69c48 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; -import forge.card.ability.SpellAbilityEffect; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; public abstract class AnimateEffectBase extends SpellAbilityEffect { @@ -36,7 +36,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect { * @param c * a {@link forge.game.card.Card} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param power * a int. * @param toughness diff --git a/forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java index 4e4c642c24d..c00b7ecb0dd 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java @@ -1,20 +1,20 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import forge.Command; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java index 00884ba16ca..5e068eeb0d8 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java index 23a11c877c7..900191cb3ca 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.TriggerType; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.TriggerType; public class BecomesBlockedEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java index 0b8ff345e6a..0e4beb3de70 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class BondEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java index 715f925599f..d1755901f21 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Iterables; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetChoices; import forge.game.GameObject; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; import forge.game.zone.MagicStack; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index 89af6567265..d7036d6b02f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import com.google.common.collect.Iterables; import forge.card.CardCharacteristicName; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class ChangeZoneAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index b3583e80a07..b9a339eb115 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.HashMap; @@ -9,17 +9,12 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.Singletons; +import forge.ai.ability.ChangeZoneAi; import forge.card.CardCharacteristicName; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.ability.ai.ChangeZoneAi; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -27,6 +22,11 @@ import forge.game.card.CardUtil; import forge.game.card.CounterType; import forge.game.combat.Combat; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.TriggerType; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; @@ -56,9 +56,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. */ private static String changeHiddenOriginStackDescription(final SpellAbility sa) { @@ -222,9 +222,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link java.lang.String} object. */ private static String changeKnownOriginStackDescription(final SpellAbility sa) { @@ -339,9 +339,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { * changeZoneResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. */ @Override @@ -365,9 +365,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ private void changeKnownOriginResolve(final SpellAbility sa) { Iterable tgtCards = getTargetCards(sa); @@ -555,9 +555,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ private static void changeHiddenOriginResolve(final SpellAbility sa) { List fetchers; @@ -602,9 +602,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param player * a {@link forge.game.player.Player} object. */ @@ -943,11 +943,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect { *

* * @param tgtSA - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param srcSA - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param si - * a {@link forge.card.spellability.SpellAbilityStackInstance} + * a {@link forge.game.spellability.SpellAbilityStackInstance} * object. * @param game */ diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java index 992c9666f67..6446c3c76f8 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityFactory; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityFactory; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; public class CharmEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java index 3f2488e3889..85654af4ee0 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import forge.card.CardType; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java index 066aefb15d4..2808a77cecc 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Collections; import java.util.List; @@ -11,17 +11,17 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.Singletons; +import forge.ai.ComputerUtilCard; import forge.card.CardRules; import forge.card.CardRulesPredicates; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.item.PaperCard; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java index b2ac4481a2c..0566542933d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java @@ -1,19 +1,19 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import forge.ai.ComputerUtilCard; import forge.card.MagicColor; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java index cf97a3bab1f..a9164952bb8 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Arrays; import java.util.List; @@ -7,14 +7,14 @@ import java.util.Map; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiChoose; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java index a234321bc3b..ec090a82746 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import java.util.Random; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ChooseNumberEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java index 1fd2a5daa7c..cc1e7665b12 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.Aggregates; public class ChoosePlayerEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseSourceEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseSourceEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java index da3099cad37..3e900fc53d1 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseSourceEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java @@ -1,25 +1,26 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; import com.google.common.base.Predicate; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityEffect; + +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; import forge.game.GameObject; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.combat.Combat; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java index 1709da888a6..6d85f456de1 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.security.InvalidParameterException; import java.util.ArrayList; @@ -6,11 +6,11 @@ import java.util.Arrays; import java.util.List; import forge.card.CardType; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ChooseTypeEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ClashEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/ClashEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java index 6973967420e..16354660cad 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ClashEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.HashMap; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; import forge.game.GameAction; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CleanUpEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/effects/CleanUpEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java index 3453e2111a6..3177dec9822 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CleanUpEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; public class CleanUpEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java index 5f64f7ffb9d..cf2d46f2f8f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -8,17 +8,17 @@ import java.util.Map; import forge.Command; import forge.Singletons; import forge.card.CardCharacteristicName; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardUtil; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.properties.ForgePreferences.FPref; public class CloneEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ControlExchangeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/effects/ControlExchangeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java index 8109912cb04..626260c8cd5 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ControlExchangeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ControlExchangeEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ControlGainEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ControlGainEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java index b7d7e3fbfc4..2dbe9fae95b 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ControlGainEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java @@ -1,17 +1,17 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Arrays; import java.util.List; import forge.Command; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class ControlGainEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java index afbd90dd301..7aa061a1a4f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Lang; /** diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java index a2da4bcc1b8..284b9e4ed4e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -15,19 +15,19 @@ import forge.Command; import forge.Singletons; import forge.card.CardCharacteristicName; import forge.card.CardRulesPredicates; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CopySpellAbilityEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/CopySpellAbilityEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java index f02c920fdbc..779a026f6dc 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CopySpellAbilityEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Iterator; @@ -6,14 +6,14 @@ import java.util.List; import com.google.common.collect.Iterables; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactory; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Lang; public class CopySpellAbilityEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CounterEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/CounterEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java index 0fea680ad91..e9e97270857 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CounterEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; -import forge.card.replacement.ReplacementResult; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.SpellPermanent; -import forge.card.trigger.TriggerType; +import forge.game.replacement.ReplacementResult; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.SpellPermanent; +import forge.game.trigger.TriggerType; import forge.gui.GuiChoose; public class CounterEffect extends SpellAbilityEffect { @@ -131,11 +131,11 @@ public class CounterEffect extends SpellAbilityEffect { *

* * @param tgtSA - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param srcSA - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param si - * a {@link forge.card.spellability.SpellAbilityStackInstance} + * a {@link forge.game.spellability.SpellAbilityStackInstance} * object. * @param sa */ diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersMoveEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersMoveEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java index 5d343677a9e..a739ed68a6f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersMoveEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import java.util.Map; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.spellability.SpellAbility; import forge.gui.GuiChoose; public class CountersMoveEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersProliferateEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersProliferateEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java index 433908b355e..6bb366b7ee0 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersProliferateEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,14 @@ import java.util.Map.Entry; import com.google.common.base.Predicate; import forge.Singletons; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.GameEntity; -import forge.game.ai.ComputerUtil; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputProliferate; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersPutAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java index 3fbfc7cfdc5..5cfac3f7466 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class CountersPutAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersPutEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java index 93f626dfa67..65c56f40ca6 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java @@ -1,14 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; + +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutOrRemoveEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersPutOrRemoveEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java index 78079715aba..6f29fbb00df 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersPutOrRemoveEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java index 9ac27774d02..17e1075181d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import java.util.Set; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class CountersRemoveAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java index 1407454cee8..148ebd94212 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import java.util.Map; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DamageAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/DamageAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java index 8fa920596fd..913ee9a0d1f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DamageAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class DamageAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DamageDealEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/DamageDealEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java index 15a2f9f93fc..c41903d4f03 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DamageDealEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Lang; public class DamageDealEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DamageEachEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/DamageEachEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java index 83c49549bd6..2423dd96559 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DamageEachEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class DamageEachEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DamagePreventAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/DamagePreventAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java index e836f504988..42c3165ecc4 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DamagePreventAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class DamagePreventAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DamagePreventEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/DamagePreventEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java index 5d0529dd923..beef30fabfd 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DamagePreventEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import java.util.TreeMap; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class DamagePreventEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DebuffAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/DebuffAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java index b510a792111..9594ccc0111 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DebuffAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class DebuffAllEffect extends SpellAbilityEffect { @@ -31,9 +31,9 @@ public class DebuffAllEffect extends SpellAbilityEffect { * debuffAllResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. */ @Override diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DebuffEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/DebuffEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java index 4707d0295ab..cabf4c9810c 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DebuffEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,10 +6,10 @@ import java.util.Iterator; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; public class DebuffEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DeclareCombatantsEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/effects/DeclareCombatantsEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java index aed24f2539c..53b232b3fac 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DeclareCombatantsEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.phase.PhaseHandler; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Lang; public class DeclareCombatantsEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DelayedTriggerEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java similarity index 83% rename from forge-gui/src/main/java/forge/card/ability/effects/DelayedTriggerEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index 9978a0ce256..f1d6b82efda 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DelayedTriggerEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.HashMap; import java.util.Map; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; public class DelayedTriggerEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DestroyAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/DestroyAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java index f2c4c4db4b5..a441f65a4b0 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DestroyAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class DestroyAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DestroyEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/effects/DestroyEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java index 05efa05e30e..fa3b9b5ee60 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DestroyEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardUtil; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class DestroyEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java similarity index 96% rename from forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java index 31352c1dd7b..530653d3c64 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,16 +6,16 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import forge.ai.ComputerUtilCard; import forge.card.CardCharacteristicName; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DigUntilEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/DigUntilEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java index fc9e2d8ac12..b8c9f452291 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DigUntilEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Collections; @@ -6,13 +6,13 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java index 994f4d09d1d..cfa8c66df49 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -7,16 +7,16 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DrainManaEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java similarity index 79% rename from forge-gui/src/main/java/forge/card/ability/effects/DrainManaEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java index 9ac6f94b6cc..b42d14e4e7d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DrainManaEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class DrainManaEffect extends SpellAbilityEffect { @Override diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DrawEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/DrawEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java index 5beac524ab1..b01ff459345 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/DrawEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.util.Lang; public class DrawEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ETBReplacementEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java similarity index 68% rename from forge-gui/src/main/java/forge/card/ability/effects/ETBReplacementEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java index a8d0c1fe172..641fcbbdefb 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ETBReplacementEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java @@ -1,8 +1,8 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/effects/EffectEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/EffectEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java index 8f9c831e04f..69d950a2a88 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/EffectEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -1,21 +1,21 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.Command; import forge.ImageCache; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; -import forge.card.trigger.TriggerType; import forge.game.Game; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; public class EffectEffect extends SpellAbilityEffect { @@ -30,9 +30,9 @@ public class EffectEffect extends SpellAbilityEffect { * effectResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. */ @Override diff --git a/forge-gui/src/main/java/forge/card/ability/effects/EncodeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/EncodeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java index 57c6072e209..1363b2115ff 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/EncodeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; public class EncodeEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/EndTurnEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/EndTurnEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java index 6853018fa3d..9c9c1d46337 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/EndTurnEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java @@ -1,10 +1,10 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; public class EndTurnEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/FightEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java similarity index 89% rename from forge-gui/src/main/java/forge/card/ability/effects/FightEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java index c67b0adb6ba..72c83ac8907 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/FightEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class FightEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/FlipCoinEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/FlipCoinEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java index 75b4a2e3b6a..5efeccc40b6 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/FlipCoinEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java @@ -1,16 +1,17 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.HashMap; import java.util.List; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; + +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.event.GameEventFlipCoin; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.util.MyRandom; public class FlipCoinEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/FogEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java similarity index 76% rename from forge-gui/src/main/java/forge/card/ability/effects/FogEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java index 0a963540d2d..4bb70af7a5f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/FogEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java @@ -1,7 +1,7 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; +import forge.game.spellability.SpellAbility; public class FogEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/GameLossEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/GameLossEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java index 4c1fb2ccbed..5acc2a1295c 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/GameLossEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class GameLossEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/GameWinEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java similarity index 76% rename from forge-gui/src/main/java/forge/card/ability/effects/GameWinEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java index 1381630f340..84a1cfcf20e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/GameWinEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java @@ -1,10 +1,10 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class GameWinEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/LifeExchangeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/effects/LifeExchangeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java index 1cd273024f6..6827211e7b7 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/LifeExchangeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class LifeExchangeEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/LifeGainEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/effects/LifeGainEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java index 8c13e648b35..01d68a55e67 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/LifeGainEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class LifeGainEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/LifeLoseEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/LifeLoseEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java index 64f6efa62bf..d1f05165d8c 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/LifeLoseEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class LifeLoseEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/LifeSetEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/LifeSetEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java index a00fd8d1261..9f3cb5de79d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/LifeSetEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiChoose; public class LifeSetEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ManaEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ManaEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java index 1a45b10a66d..fb680c1b163 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ManaEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -1,22 +1,22 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; +import forge.ai.ComputerUtilCard; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.GameActionUtil; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; @@ -220,11 +220,11 @@ public class ManaEffect extends SpellAbilityEffect { * manaStackDescription. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param abMana * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * * @return a {@link java.lang.String} object. */ diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ManaReflectedEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/ManaReflectedEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java index fef3a68dd09..e112e0689b8 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ManaReflectedEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Collection; import java.util.List; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; import forge.gui.GuiChoose; public class ManaReflectedEffect extends SpellAbilityEffect { @@ -46,7 +46,7 @@ public class ManaReflectedEffect extends SpellAbilityEffect { * @param sa * a {@link forge.card.spellability.AbilityMana} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param colors * a {@link java.util.ArrayList} object. * @param player diff --git a/forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java index 6af25883ae0..fa5dd020a07 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.card.CardCharacteristicName; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class MillEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/MustAttackEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/MustAttackEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java index 5c58b66b0d6..3963e17ce22 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/MustAttackEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.GameEntity; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class MustAttackEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/MustBlockEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/effects/MustBlockEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java index 4d52e57d481..0d86b555c79 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/MustBlockEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class MustBlockEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PeekAndRevealEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/PeekAndRevealEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java index 8738fb22e7f..919c1449e6d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PeekAndRevealEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PermanentCreatureEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/effects/PermanentCreatureEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java index 1567bf2243a..68b638dafc6 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PermanentCreatureEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java @@ -1,9 +1,9 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PermanentNoncreatureEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/effects/PermanentNoncreatureEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java index 5749a9758b5..295497cd66d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PermanentNoncreatureEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java @@ -1,9 +1,9 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PhasesEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/PhasesEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java index 4a7a78d271d..65a08924e48 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PhasesEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class PhasesEffect extends SpellAbilityEffect { @@ -38,7 +38,7 @@ public class PhasesEffect extends SpellAbilityEffect { * phasesResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ @Override public void resolve(SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PlaneswalkEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java similarity index 81% rename from forge-gui/src/main/java/forge/card/ability/effects/PlaneswalkEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java index 0b4879e393e..bace410b362 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PlaneswalkEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java index 7392d6b67af..cb90052cb4e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -11,19 +11,19 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.Singletons; +import forge.ai.ComputerUtil; import forge.card.CardCharacteristicName; import forge.card.CardRulesPredicates; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.cost.Cost; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.HumanPlay; import forge.game.player.Player; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.item.PaperCard; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PoisonEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/effects/PoisonEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java index e5a0e60556d..6a4a4dbdd1c 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PoisonEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PowerExchangeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/PowerExchangeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java index 765a40a9b34..34f66cf1166 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PowerExchangeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.event.GameEventCardStatsChanged; +import forge.game.spellability.SpellAbility; public class PowerExchangeEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ProtectAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ProtectAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java index b362366ba70..6a3cc496d7e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ProtectAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,14 @@ import java.util.List; import forge.Command; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ProtectEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/ProtectEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java index bba3a478bf6..05e9dee1891 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ProtectEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,16 +6,16 @@ import java.util.Iterator; import java.util.List; import forge.Command; +import forge.ai.ComputerUtilCard; import forge.card.MagicColor; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiChoose; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PumpAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/PumpAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java index 3a3b38bea5c..aca6f822b5e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PumpAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import forge.Command; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.event.GameEventCardStatsChanged; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class PumpAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/PumpEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/PumpEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java index 5ac9ce20244..44fbf83e9e4 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/PumpEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,17 +6,17 @@ import java.util.List; import forge.Command; import forge.card.CardType; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.event.GameEventCardStatsChanged; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/RearrangeTopOfLibraryEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java index 60354c4997f..5331a18e70d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RearrangeTopOfLibraryEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; @@ -62,9 +62,9 @@ public class RearrangeTopOfLibraryEffect extends SpellAbilityEffect { * rearrangeTopOfLibraryResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. */ @Override diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RegenerateAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/effects/RegenerateAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java index de56e9997a7..d38e661cc43 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RegenerateAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class RegenerateAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RegenerateEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/RegenerateEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java index 7b50118dc1e..3b761a79b9b 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RegenerateEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Iterator; import java.util.List; import forge.Command; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class RegenerateEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RemoveFromCombatEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/effects/RemoveFromCombatEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java index bcc90f20a7b..6a9f29f7a13 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RemoveFromCombatEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class RemoveFromCombatEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ReorderZoneEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/ReorderZoneEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java index 124547c435f..3d26be91745 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ReorderZoneEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Collections; import java.util.List; @@ -6,11 +6,11 @@ import java.util.Random; import com.google.common.collect.Lists; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Lang; import forge.util.MyRandom; @@ -35,7 +35,7 @@ public class ReorderZoneEffect extends SpellAbilityEffect { * reorderZoneResolve. *

* @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ @Override diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RepeatEachEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/RepeatEachEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java index ba87232886c..af28391182d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RepeatEachEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java @@ -1,20 +1,20 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RepeatEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/RepeatEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java index 128845ff111..16b3f6fb89c 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RepeatEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; @@ -63,9 +63,9 @@ public class RepeatEffect extends SpellAbilityEffect { *

* * @param AF - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param SA - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ private boolean checkRepeatConditions(final SpellAbility sa) { //boolean doAgain = false; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RestartGameEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/RestartGameEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java index 4402c581819..be037748382 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RestartGameEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Arrays; @@ -6,19 +6,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerHandler; -import forge.card.trigger.TriggerType; import forge.game.GameAction; import forge.game.GameStage; import forge.game.GameNew; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.RegisteredPlayer; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerHandler; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; public class RestartGameEffect extends SpellAbilityEffect { @@ -55,7 +55,7 @@ public class RestartGameEffect extends SpellAbilityEffect { //Card.resetUniqueNumber(); // need this code here, otherwise observables fail - forge.card.trigger.Trigger.resetIDs(); + forge.game.trigger.Trigger.resetIDs(); TriggerHandler trigHandler = game.getTriggerHandler(); trigHandler.clearDelayedTrigger(); trigHandler.cleanUpTemporaryTriggers(); diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RevealEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java similarity index 91% rename from forge-gui/src/main/java/forge/card/ability/effects/RevealEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java index c8d1dfa150a..75778f196fa 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RevealEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RevealHandEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/RevealHandEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java index 93e1e260a74..41e8822034f 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RevealHandEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; public class RevealHandEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/RollPlanarDiceEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java similarity index 84% rename from forge-gui/src/main/java/forge/card/ability/effects/RollPlanarDiceEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java index eb5ea868014..b5cfd900706 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/RollPlanarDiceEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java @@ -1,10 +1,10 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.PlanarDice; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; /** diff --git a/forge-gui/src/main/java/forge/card/ability/effects/SacrificeAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/SacrificeAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java index 2404d6e878e..13cf67ff7ce 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/SacrificeAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class SacrificeAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/SacrificeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java similarity index 93% rename from forge-gui/src/main/java/forge/card/ability/effects/SacrificeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java index 796e82ddde1..92f80e6e5ac 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/SacrificeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.HashMap; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ScryEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/ScryEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java index 878265fa091..8e710568e21 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ScryEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java @@ -1,4 +1,4 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.Collections; @@ -7,13 +7,13 @@ import java.util.List; import org.apache.commons.lang3.tuple.ImmutablePair; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.trigger.TriggerType; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/SetInMotionEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java similarity index 78% rename from forge-gui/src/main/java/forge/card/ability/effects/SetInMotionEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java index a1821e062d4..b58960545dc 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/SetInMotionEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class SetInMotionEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java index c726d72bdbd..f4b817897ef 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Iterator; import java.util.List; import forge.card.CardCharacteristicName; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.event.GameEventCardStatsChanged; +import forge.game.spellability.SpellAbility; public class SetStateEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ShuffleEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/effects/ShuffleEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java index 095cd33530d..0e53c287a39 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ShuffleEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java @@ -1,12 +1,12 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Iterator; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class ShuffleEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/SkipTurnEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java similarity index 83% rename from forge-gui/src/main/java/forge/card/ability/effects/SkipTurnEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java index b85fbb4c8a5..27e416ff651 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/SkipTurnEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java @@ -1,11 +1,11 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class SkipTurnEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/StoreSVarEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/StoreSVarEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java index 65115e0206d..710d55d3e17 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/StoreSVarEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java @@ -1,10 +1,10 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; public class StoreSVarEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TapAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/TapAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java index acdc4903849..20d1cece6e8 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TapAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class TapAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TapEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java similarity index 85% rename from forge-gui/src/main/java/forge/card/ability/effects/TapEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java index 36d5e947601..f597cf00eca 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TapEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; public class TapEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java similarity index 90% rename from forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java index 36e0e5227fd..64bd55bff6d 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java @@ -1,16 +1,16 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java similarity index 88% rename from forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java index 8eb24e4b45f..3f6043c10c6 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java @@ -1,13 +1,13 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiChoose; public class TapOrUntapEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TokenEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java similarity index 97% rename from forge-gui/src/main/java/forge/card/ability/effects/TokenEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java index a8f7c795ced..7341a822a6a 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TokenEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.Arrays; import java.util.List; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; import forge.card.cardfactory.CardFactory; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; import forge.game.GameEntity; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.combat.Combat; import forge.game.event.GameEventTokenCreated; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.gui.GuiChoose; import forge.item.PaperToken; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/TwoPilesEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/ability/effects/TwoPilesEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java index 9116f7a67b4..7c6c50cd239 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/TwoPilesEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java @@ -1,18 +1,18 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.GuiDialog; diff --git a/forge-gui/src/main/java/forge/card/ability/effects/UnattachAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java similarity index 95% rename from forge-gui/src/main/java/forge/card/ability/effects/UnattachAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java index 0180a303c3e..a515fd0bad2 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/UnattachAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java @@ -1,17 +1,17 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class UnattachAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/UntapAllEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java similarity index 87% rename from forge-gui/src/main/java/forge/card/ability/effects/UntapAllEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java index e0eada0d60f..dad907bc02e 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/UntapAllEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java @@ -1,14 +1,14 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; public class UntapAllEffect extends SpellAbilityEffect { diff --git a/forge-gui/src/main/java/forge/card/ability/effects/UntapEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java similarity index 86% rename from forge-gui/src/main/java/forge/card/ability/effects/UntapEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java index 7f886d422d0..9442ae88bd3 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/UntapEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java @@ -1,19 +1,19 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.List; import org.apache.commons.lang3.StringUtils; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; @@ -65,9 +65,9 @@ public class UntapEffect extends SpellAbilityEffect { *

* * @param af - * a {@link forge.card.ability.AbilityFactory} object. + * a {@link forge.game.ability.AbilityFactory} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param sa * a {@link java.util.HashMap} object. */ diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ZoneExchangeEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java similarity index 92% rename from forge-gui/src/main/java/forge/card/ability/effects/ZoneExchangeEffect.java rename to forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java index f250ac0bee8..23ddef825df 100644 --- a/forge-gui/src/main/java/forge/card/ability/effects/ZoneExchangeEffect.java +++ b/forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java @@ -1,15 +1,15 @@ -package forge.card.ability.effects; +package forge.game.ability.effects; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.ability.SpellAbilityEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/game/ability/package-info.java b/forge-gui/src/main/java/forge/game/ability/package-info.java new file mode 100644 index 00000000000..a4e870a84a5 --- /dev/null +++ b/forge-gui/src/main/java/forge/game/ability/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.game.ability; + diff --git a/forge-gui/src/main/java/forge/game/card/Card.java b/forge-gui/src/main/java/forge/game/card/Card.java index 21977a2ba0c..c254d820c8c 100644 --- a/forge-gui/src/main/java/forge/game/card/Card.java +++ b/forge-gui/src/main/java/forge/game/card/Card.java @@ -50,35 +50,22 @@ import forge.card.CardRarity; import forge.card.CardRules; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostParser; -import forge.card.replacement.ReplaceMoved; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementResult; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilityTriggered; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellPermanent; -import forge.card.spellability.TargetRestrictions; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; -import forge.card.trigger.ZCTrigger; import forge.game.Game; import forge.game.GameActionUtil; import forge.game.GameEntity; import forge.game.GameLogEntryType; import forge.game.GlobalRuleChange; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.CardPredicates.Presets; import forge.game.combat.AttackingBand; import forge.game.combat.Combat; +import forge.game.cost.Cost; import forge.game.event.GameEventCardDamaged; import forge.game.event.GameEventCardAttachment.AttachMethod; import forge.game.event.GameEventCardDamaged.DamageType; @@ -87,6 +74,19 @@ import forge.game.event.GameEventCardCounters; import forge.game.event.GameEventCardStatsChanged; import forge.game.event.GameEventCardTapped; import forge.game.player.Player; +import forge.game.replacement.ReplaceMoved; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementResult; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilityTriggered; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellPermanent; +import forge.game.spellability.TargetRestrictions; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; +import forge.game.trigger.ZCTrigger; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.item.IPaperCard; @@ -725,8 +725,8 @@ public class Card extends GameEntity implements Comparable { *

* * @param t - * a {@link forge.card.trigger.Trigger} object. - * @return a {@link forge.card.trigger.Trigger} object. + * a {@link forge.game.trigger.Trigger} object. + * @return a {@link forge.game.trigger.Trigger} object. */ public final Trigger addTrigger(final Trigger t) { final Trigger newtrig = t.getCopyForHostCard(this); @@ -754,7 +754,7 @@ public class Card extends GameEntity implements Comparable { *

* * @param t - * a {@link forge.card.trigger.Trigger} object. + * a {@link forge.game.trigger.Trigger} object. */ public final void removeTrigger(final Trigger t) { this.getCharacteristics().getTriggers().remove(t); @@ -766,7 +766,7 @@ public class Card extends GameEntity implements Comparable { *

* * @param t - * a {@link forge.card.trigger.Trigger} object. + * a {@link forge.game.trigger.Trigger} object. * * @param state * a {@link forge.card.CardCharacteristicName} object. @@ -2562,7 +2562,7 @@ public class Card extends GameEntity implements Comparable { * getSpellPermanent. *

* - * @return a {@link forge.card.spellability.SpellPermanent} object. + * @return a {@link forge.game.spellability.SpellPermanent} object. */ public final SpellPermanent getSpellPermanent() { for (final SpellAbility sa : this.getCharacteristics().getSpellAbility()) { @@ -2579,7 +2579,7 @@ public class Card extends GameEntity implements Comparable { *

* * @param a - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void addSpellAbility(final SpellAbility a) { @@ -2598,7 +2598,7 @@ public class Card extends GameEntity implements Comparable { *

* * @param a - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void removeSpellAbility(final SpellAbility a) { if (a.isManaAbility()) { @@ -2876,7 +2876,7 @@ public class Card extends GameEntity implements Comparable { * @param c * a {@link forge.Command} object. * @param typeIn - * a {@link forge.card.trigger.ZCTrigger} object. + * a {@link forge.game.trigger.ZCTrigger} object. */ public final void addTrigger(final Command c, final ZCTrigger typeIn) { this.zcTriggers.add(new AbilityTriggered(this, c, typeIn)); @@ -2890,7 +2890,7 @@ public class Card extends GameEntity implements Comparable { * @param c * a {@link forge.Command} object. * @param typeIn - * a {@link forge.card.trigger.ZCTrigger} object. + * a {@link forge.game.trigger.ZCTrigger} object. */ public final void removeTrigger(final Command c, final ZCTrigger typeIn) { this.zcTriggers.remove(new AbilityTriggered(this, c, typeIn)); @@ -2902,7 +2902,7 @@ public class Card extends GameEntity implements Comparable { *

* * @param type - * a {@link forge.card.trigger.ZCTrigger} object. + * a {@link forge.game.trigger.ZCTrigger} object. */ public final void executeTrigger(final ZCTrigger type) { for (final AbilityTriggered t : this.zcTriggers) { diff --git a/forge-gui/src/main/java/forge/game/card/CardColor.java b/forge-gui/src/main/java/forge/game/card/CardColor.java index b3d4996830f..0aeeb190b29 100644 --- a/forge-gui/src/main/java/forge/game/card/CardColor.java +++ b/forge-gui/src/main/java/forge/game/card/CardColor.java @@ -63,7 +63,7 @@ public class CardColor { *

* * @param mc - * a {@link forge.card.mana.ManaCostBeingPaid} object. + * a {@link forge.game.mana.ManaCostBeingPaid} object. * @param c * a {@link forge.game.card.Card} object. * @param addToColors diff --git a/forge-gui/src/main/java/forge/game/card/CardLists.java b/forge-gui/src/main/java/forge/game/card/CardLists.java index fca8b039fc8..ed1e82d3b19 100644 --- a/forge-gui/src/main/java/forge/game/card/CardLists.java +++ b/forge-gui/src/main/java/forge/game/card/CardLists.java @@ -28,9 +28,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.spellability.SpellAbility; -import forge.game.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCard; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/game/card/CardPredicates.java b/forge-gui/src/main/java/forge/game/card/CardPredicates.java index 49ac6c8a7f7..e745e13e3dd 100644 --- a/forge-gui/src/main/java/forge/game/card/CardPredicates.java +++ b/forge-gui/src/main/java/forge/game/card/CardPredicates.java @@ -23,9 +23,9 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import forge.card.spellability.SpellAbility; import forge.game.combat.CombatUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.PredicateString; diff --git a/forge-gui/src/main/java/forge/game/card/CardUtil.java b/forge-gui/src/main/java/forge/game/card/CardUtil.java index 887d6975cbb..24b9d0499af 100644 --- a/forge-gui/src/main/java/forge/game/card/CardUtil.java +++ b/forge-gui/src/main/java/forge/game/card/CardUtil.java @@ -29,13 +29,13 @@ import forge.card.CardCharacteristicName; import forge.card.CardCharacteristics; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.player.Player; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.properties.NewConstants; diff --git a/forge-gui/src/main/java/forge/game/combat/Combat.java b/forge-gui/src/main/java/forge/game/combat/Combat.java index 2c865dbda47..f874491411b 100644 --- a/forge-gui/src/main/java/forge/game/combat/Combat.java +++ b/forge-gui/src/main/java/forge/game/combat/Combat.java @@ -31,12 +31,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import forge.card.trigger.TriggerType; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/game/combat/CombatUtil.java b/forge-gui/src/main/java/forge/game/combat/CombatUtil.java index 3dc5bc1ad8e..dc84cb15787 100644 --- a/forge-gui/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-gui/src/main/java/forge/game/combat/CombatUtil.java @@ -28,24 +28,24 @@ import com.google.common.collect.Lists; import forge.card.CardType; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameEntity; import forge.game.GlobalRuleChange; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.phase.Untap; import forge.game.player.Player; import forge.game.player.PlayerController.ManaPaymentPurpose; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.util.Expressions; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/card/cost/Cost.java b/forge-gui/src/main/java/forge/game/cost/Cost.java similarity index 99% rename from forge-gui/src/main/java/forge/card/cost/Cost.java rename to forge-gui/src/main/java/forge/game/cost/Cost.java index 4bd8f081bfa..cfdea5bdf17 100644 --- a/forge-gui/src/main/java/forge/card/cost/Cost.java +++ b/forge-gui/src/main/java/forge/game/cost/Cost.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostParser; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.mana.ManaCostBeingPaid; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.util.TextUtil; diff --git a/forge-gui/src/main/java/forge/card/cost/CostAddMana.java b/forge-gui/src/main/java/forge/game/cost/CostAddMana.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostAddMana.java rename to forge-gui/src/main/java/forge/game/cost/CostAddMana.java index 222a6b2d6c3..04baa2828ff 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostAddMana.java +++ b/forge-gui/src/main/java/forge/game/cost/CostAddMana.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.mana.Mana; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.GameType; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.mana.Mana; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * The Class CostAddMana. diff --git a/forge-gui/src/main/java/forge/card/cost/CostDamage.java b/forge-gui/src/main/java/forge/game/cost/CostDamage.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostDamage.java rename to forge-gui/src/main/java/forge/game/cost/CostDamage.java index 386913fef4c..4b09176d539 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostDamage.java +++ b/forge-gui/src/main/java/forge/game/cost/CostDamage.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; /** diff --git a/forge-gui/src/main/java/forge/card/cost/CostDiscard.java b/forge-gui/src/main/java/forge/game/cost/CostDiscard.java similarity index 96% rename from forge-gui/src/main/java/forge/card/cost/CostDiscard.java rename to forge-gui/src/main/java/forge/game/cost/CostDiscard.java index 949bd307fec..37be63c7fb6 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostDiscard.java +++ b/forge-gui/src/main/java/forge/game/cost/CostDiscard.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import com.google.common.base.Predicate; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.AiController; import forge.game.Game; -import forge.game.ai.AiController; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; diff --git a/forge-gui/src/main/java/forge/card/cost/CostDraw.java b/forge-gui/src/main/java/forge/game/cost/CostDraw.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostDraw.java rename to forge-gui/src/main/java/forge/game/cost/CostDraw.java index 60fdaf257e9..93800a3801c 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostDraw.java +++ b/forge-gui/src/main/java/forge/game/cost/CostDraw.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; /** diff --git a/forge-gui/src/main/java/forge/card/cost/CostExile.java b/forge-gui/src/main/java/forge/game/cost/CostExile.java similarity index 96% rename from forge-gui/src/main/java/forge/card/cost/CostExile.java rename to forge-gui/src/main/java/forge/game/cost/CostExile.java index f81d38b4aca..504b1af46ef 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostExile.java +++ b/forge-gui/src/main/java/forge/game/cost/CostExile.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.GuiDialog; diff --git a/forge-gui/src/main/java/forge/card/cost/CostExileAndPay.java b/forge-gui/src/main/java/forge/game/cost/CostExileAndPay.java similarity index 93% rename from forge-gui/src/main/java/forge/card/cost/CostExileAndPay.java rename to forge-gui/src/main/java/forge/game/cost/CostExileAndPay.java index 768ef36dc3a..9b4d1c5efca 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostExileAndPay.java +++ b/forge-gui/src/main/java/forge/game/cost/CostExileAndPay.java @@ -1,16 +1,16 @@ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellPermanent; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCost; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCost; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellPermanent; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/cost/CostExiledMoveToGrave.java b/forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostExiledMoveToGrave.java rename to forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java index 704910e9d53..23919ea0a13 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostExiledMoveToGrave.java +++ b/forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/cost/CostFlipCoin.java b/forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java similarity index 93% rename from forge-gui/src/main/java/forge/card/cost/CostFlipCoin.java rename to forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java index aeec605a6b0..e488830195e 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostFlipCoin.java +++ b/forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; -import forge.card.ability.AbilityUtils; -import forge.card.ability.effects.FlipCoinEffect; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; +import forge.game.ability.effects.FlipCoinEffect; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * This is for the "FlipCoin" Cost diff --git a/forge-gui/src/main/java/forge/card/cost/CostGainControl.java b/forge-gui/src/main/java/forge/game/cost/CostGainControl.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostGainControl.java rename to forge-gui/src/main/java/forge/game/cost/CostGainControl.java index 33d95fd8c6b..ecbcaad6129 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostGainControl.java +++ b/forge-gui/src/main/java/forge/game/cost/CostGainControl.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; diff --git a/forge-gui/src/main/java/forge/card/cost/CostGainLife.java b/forge-gui/src/main/java/forge/game/cost/CostGainLife.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostGainLife.java rename to forge-gui/src/main/java/forge/game/cost/CostGainLife.java index 5dac641bcfd..2d5eb9315c5 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostGainLife.java +++ b/forge-gui/src/main/java/forge/game/cost/CostGainLife.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiChoose; /** diff --git a/forge-gui/src/main/java/forge/card/cost/CostMill.java b/forge-gui/src/main/java/forge/game/cost/CostMill.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostMill.java rename to forge-gui/src/main/java/forge/game/cost/CostMill.java index 90073cd4d91..a48246d02d3 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostMill.java +++ b/forge-gui/src/main/java/forge/game/cost/CostMill.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.List; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; diff --git a/forge-gui/src/main/java/forge/card/cost/CostPart.java b/forge-gui/src/main/java/forge/game/cost/CostPart.java similarity index 88% rename from forge-gui/src/main/java/forge/card/cost/CostPart.java rename to forge-gui/src/main/java/forge/game/cost/CostPart.java index 033107bdd60..770ee7f6e6e 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPart.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPart.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import org.apache.commons.lang3.StringUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * The Class CostPart. @@ -156,11 +156,11 @@ public abstract class CostPart { * @param ai * {@link forge.player.Player} * @param ability - * {@link forge.card.spellability.SpellAbility} + * {@link forge.game.spellability.SpellAbility} * @param source * {@link forge.game.card.Card} * @param payment - * {@link forge.card.cost.CostPayment} + * {@link forge.game.cost.CostPayment} * @return true, if successful */ public abstract PaymentDecision decideAIPayment(final Player ai, SpellAbility ability, Card source); @@ -171,11 +171,11 @@ public abstract class CostPart { * @param ai * {@link forge.player.Player} * @param ability - * {@link forge.card.spellability.SpellAbility} + * {@link forge.game.spellability.SpellAbility} * @param source * {@link forge.game.card.Card} * @param payment - * {@link forge.card.cost.CostPayment} + * {@link forge.game.cost.CostPayment} * @param game * @return */ @@ -185,11 +185,11 @@ public abstract class CostPart { * Pay human. * * @param ability - * {@link forge.card.spellability.SpellAbility} + * {@link forge.game.spellability.SpellAbility} * @param source * {@link forge.game.card.Card} * @param payment - * {@link forge.card.cost.CostPayment} + * {@link forge.game.cost.CostPayment} * @param game * @return true, if successful */ diff --git a/forge-gui/src/main/java/forge/card/cost/CostPartMana.java b/forge-gui/src/main/java/forge/game/cost/CostPartMana.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostPartMana.java rename to forge-gui/src/main/java/forge/game/cost/CostPartMana.java index a0ad106da7c..c2a315960e4 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPartMana.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPartMana.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import forge.Singletons; +import forge.ai.ComputerUtilMana; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostShard; -import forge.card.spellability.SpellAbility; import forge.game.Game; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.input.InputPayMana; import forge.gui.input.InputPayManaOfCostPayment; import forge.gui.input.InputPayManaX; diff --git a/forge-gui/src/main/java/forge/card/cost/CostPartWithList.java b/forge-gui/src/main/java/forge/game/cost/CostPartWithList.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostPartWithList.java rename to forge-gui/src/main/java/forge/game/cost/CostPartWithList.java index 26e400032c7..7abfff3c3c9 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPartWithList.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPartWithList.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * The Class CostPartWithList. diff --git a/forge-gui/src/main/java/forge/card/cost/CostPayLife.java b/forge-gui/src/main/java/forge/game/cost/CostPayLife.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostPayLife.java rename to forge-gui/src/main/java/forge/game/cost/CostPayLife.java index 17cbe222a61..dd93027f366 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPayLife.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPayLife.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; /** diff --git a/forge-gui/src/main/java/forge/card/cost/CostPayment.java b/forge-gui/src/main/java/forge/game/cost/CostPayment.java similarity index 93% rename from forge-gui/src/main/java/forge/card/cost/CostPayment.java rename to forge-gui/src/main/java/forge/game/cost/CostPayment.java index e9056bbf772..3f47eca5d8a 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPayment.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPayment.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

@@ -44,7 +44,7 @@ public class CostPayment { * Getter for the field cost. *

* - * @return a {@link forge.card.cost.Cost} object. + * @return a {@link forge.game.cost.Cost} object. */ public final Cost getCost() { return this.cost; @@ -56,9 +56,9 @@ public class CostPayment { *

* * @param cost - * a {@link forge.card.cost.Cost} object. + * a {@link forge.game.cost.Cost} object. * @param abil - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public CostPayment(final Cost cost, final SpellAbility abil) { this.cost = cost; @@ -71,9 +71,9 @@ public class CostPayment { *

* * @param cost - * a {@link forge.card.cost.Cost} object. + * a {@link forge.game.cost.Cost} object. * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public static boolean canPayAdditionalCosts(final Cost cost, final SpellAbility ability) { diff --git a/forge-gui/src/main/java/forge/card/cost/CostPutCardToLib.java b/forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostPutCardToLib.java rename to forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java index 3d5030adf1f..c03ceb430cc 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPutCardToLib.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostPutCounter.java b/forge-gui/src/main/java/forge/game/cost/CostPutCounter.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostPutCounter.java rename to forge-gui/src/main/java/forge/game/cost/CostPutCounter.java index 4f0497c791f..6f36b5c73e5 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostPutCounter.java +++ b/forge-gui/src/main/java/forge/game/cost/CostPutCounter.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.HashMap; import java.util.List; import java.util.Map; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtilCard; import forge.game.Game; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostRemoveAnyCounter.java b/forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostRemoveAnyCounter.java rename to forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java index d73e18df744..5d4bf8ef79e 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostRemoveAnyCounter.java +++ b/forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; @@ -23,14 +23,14 @@ import java.util.Map; import com.google.common.base.Predicate; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostRemoveCounter.java b/forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java similarity index 96% rename from forge-gui/src/main/java/forge/card/cost/CostRemoveCounter.java rename to forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java index 0a5dea7fca5..2e570384d4d 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostRemoveCounter.java +++ b/forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.HashMap; @@ -25,13 +25,13 @@ import java.util.Map; import com.google.common.collect.Lists; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostReturn.java b/forge-gui/src/main/java/forge/game/cost/CostReturn.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostReturn.java rename to forge-gui/src/main/java/forge/game/cost/CostReturn.java index 643b74845f9..5d010159ace 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostReturn.java +++ b/forge-gui/src/main/java/forge/game/cost/CostReturn.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostReveal.java b/forge-gui/src/main/java/forge/game/cost/CostReveal.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostReveal.java rename to forge-gui/src/main/java/forge/game/cost/CostReveal.java index c6ddd963dbf..b3e48c7c492 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostReveal.java +++ b/forge-gui/src/main/java/forge/game/cost/CostReveal.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; @@ -24,15 +24,15 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.AiController; import forge.game.Game; -import forge.game.ai.AiController; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; diff --git a/forge-gui/src/main/java/forge/card/cost/CostSacrifice.java b/forge-gui/src/main/java/forge/game/cost/CostSacrifice.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostSacrifice.java rename to forge-gui/src/main/java/forge/game/cost/CostSacrifice.java index dc66543bffc..e5f3b6647be 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostSacrifice.java +++ b/forge-gui/src/main/java/forge/game/cost/CostSacrifice.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiDialog; import forge.gui.input.InputSelectCards; diff --git a/forge-gui/src/main/java/forge/card/cost/CostTap.java b/forge-gui/src/main/java/forge/game/cost/CostTap.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostTap.java rename to forge-gui/src/main/java/forge/game/cost/CostTap.java index 51a01ac3e15..13d5e2dc3c3 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostTap.java +++ b/forge-gui/src/main/java/forge/game/cost/CostTap.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * The Class CostTap. diff --git a/forge-gui/src/main/java/forge/card/cost/CostTapType.java b/forge-gui/src/main/java/forge/game/cost/CostTapType.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostTapType.java rename to forge-gui/src/main/java/forge/game/cost/CostTapType.java index 161de39a2e0..da61b3b0d04 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostTapType.java +++ b/forge-gui/src/main/java/forge/game/cost/CostTapType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; @@ -23,14 +23,14 @@ import java.util.List; import com.google.common.base.Predicate; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; diff --git a/forge-gui/src/main/java/forge/card/cost/CostUnattach.java b/forge-gui/src/main/java/forge/game/cost/CostUnattach.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostUnattach.java rename to forge-gui/src/main/java/forge/game/cost/CostUnattach.java index bd9ce239a01..8ea21c01071 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostUnattach.java +++ b/forge-gui/src/main/java/forge/game/cost/CostUnattach.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.GuiDialog; /** diff --git a/forge-gui/src/main/java/forge/card/cost/CostUntap.java b/forge-gui/src/main/java/forge/game/cost/CostUntap.java similarity index 94% rename from forge-gui/src/main/java/forge/card/cost/CostUntap.java rename to forge-gui/src/main/java/forge/game/cost/CostUntap.java index 5addcdf7bf8..f261395ef28 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostUntap.java +++ b/forge-gui/src/main/java/forge/game/cost/CostUntap.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * The Class CostUntap. diff --git a/forge-gui/src/main/java/forge/card/cost/CostUntapType.java b/forge-gui/src/main/java/forge/game/cost/CostUntapType.java similarity index 95% rename from forge-gui/src/main/java/forge/card/cost/CostUntapType.java rename to forge-gui/src/main/java/forge/game/cost/CostUntapType.java index 22ed90e5416..cbd3ecd4840 100644 --- a/forge-gui/src/main/java/forge/card/cost/CostUntapType.java +++ b/forge-gui/src/main/java/forge/game/cost/CostUntapType.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.cost; +package forge.game.cost; import java.util.List; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; +import forge.ai.ComputerUtil; import forge.game.Game; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; diff --git a/forge-gui/src/main/java/forge/card/cost/PaymentDecision.java b/forge-gui/src/main/java/forge/game/cost/PaymentDecision.java similarity index 91% rename from forge-gui/src/main/java/forge/card/cost/PaymentDecision.java rename to forge-gui/src/main/java/forge/game/cost/PaymentDecision.java index 485b006b7d9..a1963796afb 100644 --- a/forge-gui/src/main/java/forge/card/cost/PaymentDecision.java +++ b/forge-gui/src/main/java/forge/game/cost/PaymentDecision.java @@ -1,4 +1,4 @@ -package forge.card.cost; +package forge.game.cost; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/card/cost/package-info.java b/forge-gui/src/main/java/forge/game/cost/package-info.java similarity index 50% rename from forge-gui/src/main/java/forge/card/cost/package-info.java rename to forge-gui/src/main/java/forge/game/cost/package-info.java index 2d1ebce369b..e4910979e33 100644 --- a/forge-gui/src/main/java/forge/card/cost/package-info.java +++ b/forge-gui/src/main/java/forge/game/cost/package-info.java @@ -1,3 +1,3 @@ /** Forge Card Game. */ -package forge.card.cost; +package forge.game.cost; diff --git a/forge-gui/src/main/java/forge/game/event/GameEventManaPool.java b/forge-gui/src/main/java/forge/game/event/GameEventManaPool.java index 9ef54610f08..728a53c95a6 100644 --- a/forge-gui/src/main/java/forge/game/event/GameEventManaPool.java +++ b/forge-gui/src/main/java/forge/game/event/GameEventManaPool.java @@ -1,6 +1,6 @@ package forge.game.event; -import forge.card.mana.Mana; +import forge.game.mana.Mana; import forge.game.player.Player; import forge.util.Lang; diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java b/forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java index c2750be130e..eb6485fe8b7 100644 --- a/forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java +++ b/forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java @@ -1,6 +1,6 @@ package forge.game.event; -import forge.card.spellability.SpellAbility; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java b/forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java index 15c8ff86131..3e6a9447c6b 100644 --- a/forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java +++ b/forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java @@ -1,6 +1,6 @@ package forge.game.event; -import forge.card.spellability.SpellAbility; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java b/forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java index 9aba28b3337..97b2db77589 100644 --- a/forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java +++ b/forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java @@ -1,6 +1,6 @@ package forge.game.event; -import forge.card.spellability.SpellAbility; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/mana/Mana.java b/forge-gui/src/main/java/forge/game/mana/Mana.java similarity index 97% rename from forge-gui/src/main/java/forge/card/mana/Mana.java rename to forge-gui/src/main/java/forge/game/mana/Mana.java index 11d737d3995..bdf9133418c 100644 --- a/forge-gui/src/main/java/forge/card/mana/Mana.java +++ b/forge-gui/src/main/java/forge/game/mana/Mana.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.mana; +package forge.game.mana; import forge.card.MagicColor; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java b/forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java similarity index 98% rename from forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java rename to forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java index 34497726fa4..2c81dd4b843 100644 --- a/forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java +++ b/forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.mana; +package forge.game.mana; import java.util.ArrayList; import java.util.Iterator; @@ -30,14 +30,18 @@ import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; +import forge.card.mana.IParserManaCost; +import forge.card.mana.ManaCost; +import forge.card.mana.ManaCostParser; +import forge.card.mana.ManaCostShard; import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.util.TextUtil; @@ -315,7 +319,7 @@ public class ManaCostBeingPaid { *

* * @param mana - * a {@link forge.card.mana.Mana} object. + * a {@link forge.game.mana.Mana} object. * @return a boolean. */ public final boolean payMana(final Mana mana) { diff --git a/forge-gui/src/main/java/forge/card/mana/ManaPool.java b/forge-gui/src/main/java/forge/game/mana/ManaPool.java similarity index 95% rename from forge-gui/src/main/java/forge/card/mana/ManaPool.java rename to forge-gui/src/main/java/forge/game/mana/ManaPool.java index 62ac784d39d..fa017df33ec 100644 --- a/forge-gui/src/main/java/forge/card/mana/ManaPool.java +++ b/forge-gui/src/main/java/forge/game/mana/ManaPool.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.mana; +package forge.game.mana; import java.util.ArrayList; import java.util.Arrays; @@ -29,14 +29,15 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import forge.card.MagicColor; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; +import forge.card.mana.ManaCostShard; import forge.game.GlobalRuleChange; import forge.game.event.EventValueChangeType; import forge.game.event.GameEventManaPool; import forge.game.event.GameEventZone; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** @@ -146,8 +147,8 @@ public class ManaPool { * @param manaStr * a {@link java.lang.String} object. * @param saBeingPaidFor - * a {@link forge.card.spellability.SpellAbility} object. - * @return a {@link forge.card.mana.Mana} object. + * a {@link forge.game.spellability.SpellAbility} object. + * @return a {@link forge.game.mana.Mana} object. */ private Mana getMana(final ManaCostShard shard, final SpellAbility saBeingPaidFor, String restriction) { final List> weightedOptions = selectManaToPayFor(shard, saBeingPaidFor, restriction); @@ -239,7 +240,7 @@ public class ManaPool { * @param pool * a {@link java.util.ArrayList} object. * @param choice - * a {@link forge.card.mana.Mana} object. + * a {@link forge.game.mana.Mana} object. */ private void removeMana(final Mana mana) { Collection cm = floatingMana.get(mana.getColorCode()); @@ -267,12 +268,12 @@ public class ManaPool { *

* * @param saPaidFor - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param manaCost - * a {@link forge.card.mana.ManaCostBeingPaid} object. + * a {@link forge.game.mana.ManaCostBeingPaid} object. * @param saPayment * a {@link forge.card.spellability.AbilityMana} object. - * @return a {@link forge.card.mana.ManaCostBeingPaid} object. + * @return a {@link forge.game.mana.ManaCostBeingPaid} object. */ public final void payManaFromAbility(final SpellAbility saPaidFor, ManaCostBeingPaid manaCost, final SpellAbility saPayment) { // Mana restriction must be checked before this method is called @@ -323,7 +324,7 @@ public class ManaPool { *

* * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param refund * a boolean. */ diff --git a/forge-gui/src/main/java/forge/card/mana/package-info.java b/forge-gui/src/main/java/forge/game/mana/package-info.java similarity index 50% rename from forge-gui/src/main/java/forge/card/mana/package-info.java rename to forge-gui/src/main/java/forge/game/mana/package-info.java index 361ad2ab75a..5ad8c6a2f8a 100644 --- a/forge-gui/src/main/java/forge/card/mana/package-info.java +++ b/forge-gui/src/main/java/forge/game/mana/package-info.java @@ -1,3 +1,3 @@ /** Forge Card Game. */ -package forge.card.mana; +package forge.game.mana; diff --git a/forge-gui/src/main/java/forge/game/phase/EndOfTurn.java b/forge-gui/src/main/java/forge/game/phase/EndOfTurn.java index a6365b6bb9f..55e2074a483 100644 --- a/forge-gui/src/main/java/forge/game/phase/EndOfTurn.java +++ b/forge-gui/src/main/java/forge/game/phase/EndOfTurn.java @@ -17,14 +17,14 @@ */ package forge.game.phase; -import forge.card.ability.AbilityFactory; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.AbilityFactory; import forge.game.card.Card; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java b/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java index bb1bb8ece92..14c5748d3dd 100644 --- a/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java @@ -29,23 +29,20 @@ import com.google.common.collect.Multimap; import forge.FThreads; import forge.Singletons; -import forge.card.ability.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.TriggerType; import forge.game.GameEntity; import forge.game.GameStage; import forge.game.Game; import forge.game.GameType; import forge.game.GlobalRuleChange; +import forge.game.ability.AbilityFactory; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; +import forge.game.cost.Cost; import forge.game.event.GameEventAttackersDeclared; import forge.game.event.GameEventBlockersDeclared; import forge.game.event.GameEventCombatEnded; @@ -57,6 +54,9 @@ import forge.game.event.GameEventManaBurn; import forge.game.event.GameEventTurnPhase; import forge.game.player.Player; import forge.game.player.PlayerController.ManaPaymentPurpose; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.properties.ForgePreferences.FPref; import forge.util.CollectionSuppliers; diff --git a/forge-gui/src/main/java/forge/game/phase/Untap.java b/forge-gui/src/main/java/forge/game/phase/Untap.java index 4991e97328f..77238b2785a 100644 --- a/forge-gui/src/main/java/forge/game/phase/Untap.java +++ b/forge-gui/src/main/java/forge/game/phase/Untap.java @@ -24,9 +24,9 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import forge.Singletons; +import forge.ai.ComputerUtilCard; import forge.game.Game; import forge.game.GameEntity; -import forge.game.ai.ComputerUtilCard; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; diff --git a/forge-gui/src/main/java/forge/game/phase/Upkeep.java b/forge-gui/src/main/java/forge/game/phase/Upkeep.java index 80bc9ee3ba0..aa1eeb10006 100644 --- a/forge-gui/src/main/java/forge/game/phase/Upkeep.java +++ b/forge-gui/src/main/java/forge/game/phase/Upkeep.java @@ -21,19 +21,19 @@ import java.util.HashMap; import java.util.List; import com.google.common.base.Predicate; -import forge.card.ability.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; +import forge.game.ability.AbilityFactory; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; +import forge.game.cost.Cost; import forge.game.player.Player; import forge.game.player.PlayerController.ManaPaymentPurpose; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/game/player/HumanPlay.java b/forge-gui/src/main/java/forge/game/player/HumanPlay.java index 7fa63305cdb..a345fe6ad6a 100644 --- a/forge-gui/src/main/java/forge/game/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/game/player/HumanPlay.java @@ -10,48 +10,48 @@ import com.google.common.base.Predicate; import forge.FThreads; import forge.Singletons; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.effects.CharmEffect; -import forge.card.ability.effects.FlipCoinEffect; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; -import forge.card.cost.CostAddMana; -import forge.card.cost.CostDamage; -import forge.card.cost.CostDiscard; -import forge.card.cost.CostDraw; -import forge.card.cost.CostExile; -import forge.card.cost.CostFlipCoin; -import forge.card.cost.CostGainControl; -import forge.card.cost.CostGainLife; -import forge.card.cost.CostMill; -import forge.card.cost.CostPart; -import forge.card.cost.CostPartMana; -import forge.card.cost.CostPartWithList; -import forge.card.cost.CostPayLife; -import forge.card.cost.CostPayment; -import forge.card.cost.CostPutCardToLib; -import forge.card.cost.CostPutCounter; -import forge.card.cost.CostRemoveAnyCounter; -import forge.card.cost.CostRemoveCounter; -import forge.card.cost.CostReturn; -import forge.card.cost.CostReveal; -import forge.card.cost.CostSacrifice; -import forge.card.cost.CostTapType; import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.Ability; -import forge.card.spellability.HumanPlaySpellAbility; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.GameActionUtil; import forge.game.Game; import forge.game.GameLogEntryType; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.effects.CharmEffect; +import forge.game.ability.effects.FlipCoinEffect; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; +import forge.game.cost.Cost; +import forge.game.cost.CostAddMana; +import forge.game.cost.CostDamage; +import forge.game.cost.CostDiscard; +import forge.game.cost.CostDraw; +import forge.game.cost.CostExile; +import forge.game.cost.CostFlipCoin; +import forge.game.cost.CostGainControl; +import forge.game.cost.CostGainLife; +import forge.game.cost.CostMill; +import forge.game.cost.CostPart; +import forge.game.cost.CostPartMana; +import forge.game.cost.CostPartWithList; +import forge.game.cost.CostPayLife; +import forge.game.cost.CostPayment; +import forge.game.cost.CostPutCardToLib; +import forge.game.cost.CostPutCounter; +import forge.game.cost.CostRemoveAnyCounter; +import forge.game.cost.CostRemoveCounter; +import forge.game.cost.CostReturn; +import forge.game.cost.CostReveal; +import forge.game.cost.CostSacrifice; +import forge.game.cost.CostTapType; +import forge.game.mana.ManaCostBeingPaid; +import forge.game.spellability.Ability; +import forge.game.spellability.HumanPlaySpellAbility; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.GuiDialog; @@ -81,7 +81,7 @@ public class HumanPlay { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final static void playSpellAbility(Player p, SpellAbility sa) { FThreads.assertExecutedByEdt(false); @@ -195,7 +195,7 @@ public class HumanPlay { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public static final void playSaWithoutPayingManaCost(final Game game, final SpellAbility sa, boolean mayChooseNewTargets) { FThreads.assertExecutedByEdt(false); @@ -228,7 +228,7 @@ public class HumanPlay { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param skipTargeting * a boolean. */ @@ -276,9 +276,9 @@ public class HumanPlay { *

* * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param cost - * a {@link forge.card.cost.Cost} object. + * a {@link forge.game.cost.Cost} object. * @param paid * a {@link forge.Command} object. * @param unpaid diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java b/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java index a7e9f5033c7..8ac866bdbba 100644 --- a/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java +++ b/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java @@ -1,8 +1,8 @@ package forge.game.player; import forge.Singletons; +import forge.ai.AiProfileUtil; import forge.game.Game; -import forge.game.ai.AiProfileUtil; import forge.properties.ForgePreferences.FPref; public class LobbyPlayerAi extends LobbyPlayer { diff --git a/forge-gui/src/main/java/forge/game/player/Player.java b/forge-gui/src/main/java/forge/game/player/Player.java index 7d64584eaae..84ddfdff8fd 100644 --- a/forge-gui/src/main/java/forge/game/player/Player.java +++ b/forge-gui/src/main/java/forge/game/player/Player.java @@ -36,22 +36,16 @@ import forge.Constant.Preferences; import forge.FThreads; import forge.Singletons; import forge.card.MagicColor; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; import forge.card.mana.ManaCost; -import forge.card.mana.ManaPool; -import forge.card.replacement.ReplacementResult; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameActionUtil; import forge.game.GameEntity; import forge.game.GameStage; import forge.game.GameType; import forge.game.GlobalRuleChange; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -64,8 +58,14 @@ import forge.game.event.GameEventPlayerDamaged; import forge.game.event.GameEventPlayerLivesChanged; import forge.game.event.GameEventPlayerPoisoned; import forge.game.event.GameEventShuffle; +import forge.game.mana.ManaPool; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; +import forge.game.replacement.ReplacementResult; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.PlayerZoneBattlefield; import forge.game.zone.Zone; @@ -1639,7 +1639,7 @@ public class Player extends GameEntity implements Comparable { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a {@link forge.CardList} object. */ public final boolean discard(final Card c, final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/game/player/PlayerController.java b/forge-gui/src/main/java/forge/game/player/PlayerController.java index d608db6a821..081a0e19059 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerController.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerController.java @@ -11,13 +11,6 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; -import forge.card.cost.Cost; -import forge.card.mana.Mana; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetChoices; import forge.deck.Deck; import forge.game.Game; import forge.game.GameEntity; @@ -26,7 +19,14 @@ import forge.game.GameType; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.combat.Combat; +import forge.game.cost.Cost; +import forge.game.mana.Mana; import forge.game.phase.PhaseType; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; import forge.game.zone.ZoneType; diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java index 96b60babcf5..875ce606db5 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java @@ -14,34 +14,34 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import forge.card.ability.ApiType; -import forge.card.ability.ai.CharmAi; -import forge.card.cost.Cost; -import forge.card.mana.Mana; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilityStatic; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetChoices; +import forge.ai.AiBlockController; +import forge.ai.AiController; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; +import forge.ai.ComputerUtilCombat; +import forge.ai.ComputerUtilCost; +import forge.ai.ability.CharmAi; import forge.deck.Deck; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; import forge.game.GameType; -import forge.game.ai.AiController; -import forge.game.ai.ComputerUtil; -import forge.game.ai.AiBlockController; -import forge.game.ai.ComputerUtilCard; -import forge.game.ai.ComputerUtilCombat; -import forge.game.ai.ComputerUtilCost; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CounterType; import forge.game.combat.Combat; +import forge.game.cost.Cost; +import forge.game.mana.Mana; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilityStatic; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java index 88fd5db558c..3c9270ab040 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -26,15 +26,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.Singletons; -import forge.card.ability.effects.CharmEffect; -import forge.card.cost.Cost; -import forge.card.mana.Mana; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetSelection; -import forge.card.spellability.TargetChoices; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -42,10 +33,19 @@ import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; import forge.game.GameType; +import forge.game.ability.effects.CharmEffect; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.combat.Combat; +import forge.game.cost.Cost; +import forge.game.mana.Mana; import forge.game.phase.PhaseType; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; +import forge.game.spellability.TargetSelection; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceCounter.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceCounter.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java index 2061d617c26..38bec2de35c 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceCounter.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceDamage.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java similarity index 95% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceDamage.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java index cd182faadc0..6ea42c6243d 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceDamage.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.util.Expressions; /** diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceDestroy.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceDestroy.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java index e5c62537e7b..a2ce166d3bc 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceDestroy.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceDiscard.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceDiscard.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java index de3767d9e13..34ef3d0d7fd 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceDiscard.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceDraw.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceDraw.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java index 767832c475f..bc35a5ec832 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceDraw.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceGainLife.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceGainLife.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java index bbb2128b60e..5c40c99fe64 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceGainLife.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceGameLoss.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java similarity index 92% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceGameLoss.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java index cd623e03a69..654f9494b71 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceGameLoss.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java @@ -1,4 +1,4 @@ - package forge.card.replacement; + package forge.game.replacement; import java.util.Map; diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceMoved.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java similarity index 93% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceMoved.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java index ebe1e7dc8c2..1844f0eb236 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceMoved.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java @@ -1,9 +1,9 @@ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceProduceMana.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java similarity index 91% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceProduceMana.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java index 4ccf6b67b78..065d9cba7a2 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceProduceMana.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java @@ -1,9 +1,9 @@ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceSetInMotion.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java similarity index 95% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceSetInMotion.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java index bc95c729f76..7c47a05a075 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceSetInMotion.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceTurnFaceUp.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java similarity index 91% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceTurnFaceUp.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java index e8a4c884b36..420bc267b99 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceTurnFaceUp.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java @@ -1,9 +1,9 @@ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplaceUntap.java b/forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java similarity index 93% rename from forge-gui/src/main/java/forge/card/replacement/ReplaceUntap.java rename to forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java index 895ee529aa6..6257e590fa2 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplaceUntap.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.phase.PhaseType; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplacementEffect.java b/forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java similarity index 94% rename from forge-gui/src/main/java/forge/card/replacement/ReplacementEffect.java rename to forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java index 597f9643b3b..5446b856cb5 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplacementEffect.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.List; import java.util.Map; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.TriggerReplacementBase; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Expressions; /** diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplacementHandler.java b/forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java similarity index 96% rename from forge-gui/src/main/java/forge/card/replacement/ReplacementHandler.java rename to forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java index 52ef76d9163..d03e9bdd2b7 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplacementHandler.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.replacement; +package forge.game.replacement; import java.util.ArrayList; import java.util.EnumSet; @@ -25,13 +25,13 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.GameLogEntryType; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.util.FileSection; diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplacementLayer.java b/forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java similarity index 91% rename from forge-gui/src/main/java/forge/card/replacement/ReplacementLayer.java rename to forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java index 46d71841f28..8e8345857f1 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplacementLayer.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java @@ -1,4 +1,4 @@ -package forge.card.replacement; +package forge.game.replacement; /** diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplacementResult.java b/forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java similarity index 75% rename from forge-gui/src/main/java/forge/card/replacement/ReplacementResult.java rename to forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java index 62bb04d0e38..f56cbced895 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplacementResult.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java @@ -1,4 +1,4 @@ -package forge.card.replacement; +package forge.game.replacement; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/replacement/ReplacementType.java b/forge-gui/src/main/java/forge/game/replacement/ReplacementType.java similarity index 96% rename from forge-gui/src/main/java/forge/card/replacement/ReplacementType.java rename to forge-gui/src/main/java/forge/game/replacement/ReplacementType.java index cd0c83d31a0..8984eabe954 100644 --- a/forge-gui/src/main/java/forge/card/replacement/ReplacementType.java +++ b/forge-gui/src/main/java/forge/game/replacement/ReplacementType.java @@ -1,4 +1,4 @@ -package forge.card.replacement; +package forge.game.replacement; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/forge-gui/src/main/java/forge/game/replacement/package-info.java b/forge-gui/src/main/java/forge/game/replacement/package-info.java new file mode 100644 index 00000000000..be28b8eee3b --- /dev/null +++ b/forge-gui/src/main/java/forge/game/replacement/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.game.replacement; + diff --git a/forge-gui/src/main/java/forge/card/spellability/Ability.java b/forge-gui/src/main/java/forge/game/spellability/Ability.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/Ability.java rename to forge-gui/src/main/java/forge/game/spellability/Ability.java index 9f490385c89..f1920cd82c0 100644 --- a/forge-gui/src/main/java/forge/card/spellability/Ability.java +++ b/forge-gui/src/main/java/forge/game/spellability/Ability.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import com.esotericsoftware.minlog.Log; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.card.Card; +import forge.game.cost.Cost; /** *

diff --git a/forge-gui/src/main/java/forge/card/spellability/AbilityActivated.java b/forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java similarity index 94% rename from forge-gui/src/main/java/forge/card/spellability/AbilityActivated.java rename to forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java index 88b73db5acd..8d8c33373c1 100644 --- a/forge-gui/src/main/java/forge/card/spellability/AbilityActivated.java +++ b/forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; -import forge.card.cost.Cost; -import forge.card.cost.CostPayment; -import forge.card.staticability.StaticAbility; import forge.game.Game; import forge.game.GlobalRuleChange; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.cost.CostPayment; import forge.game.player.Player; +import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; /** @@ -62,9 +62,9 @@ public abstract class AbilityActivated extends SpellAbility implements java.io.S * @param sourceCard * a {@link forge.game.card.Card} object. * @param abCost - * a {@link forge.card.cost.Cost} object. + * a {@link forge.game.cost.Cost} object. * @param tgt - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. */ public AbilityActivated(final Card sourceCard, final Cost abCost, final TargetRestrictions tgt) { super(sourceCard, abCost); diff --git a/forge-gui/src/main/java/forge/card/spellability/AbilityManaPart.java b/forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/AbilityManaPart.java rename to forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java index 12c234575e5..acea9c5ac48 100644 --- a/forge-gui/src/main/java/forge/card/spellability/AbilityManaPart.java +++ b/forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.HashMap; @@ -28,16 +28,16 @@ import org.apache.commons.lang3.StringUtils; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.mana.Mana; -import forge.card.mana.ManaPool; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.replacement.ReplacementLayer; -import forge.card.replacement.ReplacementResult; -import forge.card.trigger.TriggerType; import forge.game.GameType; import forge.game.card.Card; +import forge.game.mana.Mana; +import forge.game.mana.ManaPool; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.replacement.ReplacementLayer; +import forge.game.replacement.ReplacementResult; +import forge.game.trigger.TriggerType; /** *

@@ -270,7 +270,7 @@ public class AbilityManaPart implements java.io.Serializable { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public boolean meetsManaRestrictions(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/spellability/AbilityStatic.java b/forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java similarity index 96% rename from forge-gui/src/main/java/forge/card/spellability/AbilityStatic.java rename to forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java index 752121ba6a3..3ccbf095a90 100644 --- a/forge-gui/src/main/java/forge/card/spellability/AbilityStatic.java +++ b/forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.game.card.Card; +import forge.game.cost.Cost; /** *

diff --git a/forge-gui/src/main/java/forge/card/spellability/AbilitySub.java b/forge-gui/src/main/java/forge/game/spellability/AbilitySub.java similarity index 85% rename from forge-gui/src/main/java/forge/card/spellability/AbilitySub.java rename to forge-gui/src/main/java/forge/game/spellability/AbilitySub.java index 3c3a85b2a6b..9894e8ee062 100644 --- a/forge-gui/src/main/java/forge/card/spellability/AbilitySub.java +++ b/forge-gui/src/main/java/forge/game/spellability/AbilitySub.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.Map; -import forge.card.ability.AbilityFactory; -import forge.card.ability.ApiType; -import forge.card.ability.SpellAbilityAi; -import forge.card.ability.SpellAbilityEffect; -import forge.card.ability.effects.ChangeZoneAllEffect; -import forge.card.ability.effects.ChangeZoneEffect; -import forge.card.ability.effects.ManaEffect; -import forge.card.ability.effects.ManaReflectedEffect; import forge.card.cardfactory.CardFactory; -import forge.card.cost.Cost; +import forge.game.ability.AbilityFactory; +import forge.game.ability.ApiType; +import forge.game.ability.SpellAbilityAi; +import forge.game.ability.SpellAbilityEffect; +import forge.game.ability.effects.ChangeZoneAllEffect; +import forge.game.ability.effects.ChangeZoneEffect; +import forge.game.ability.effects.ManaEffect; +import forge.game.ability.effects.ManaReflectedEffect; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; /** @@ -52,7 +52,7 @@ public final class AbilitySub extends SpellAbility implements java.io.Serializab *

* * @param parent - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void setParent(final SpellAbility parent) { this.parent = parent; @@ -63,7 +63,7 @@ public final class AbilitySub extends SpellAbility implements java.io.Serializab * Getter for the field parent. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ @Override public final SpellAbility getParent() { diff --git a/forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java b/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java rename to forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java index e00dacaa961..05d7045c1d2 100644 --- a/forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java +++ b/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.Arrays; @@ -23,8 +23,8 @@ import forge.Command; import forge.card.CardCharacteristicName; import forge.card.CardCharacteristics; import forge.card.mana.ManaCost; -import forge.card.trigger.ZCTrigger; import forge.game.card.Card; +import forge.game.trigger.ZCTrigger; /** *

@@ -79,7 +79,7 @@ public class AbilityTriggered extends Ability implements Command { * @param sourceCommand * a {@link forge.Command} object. * @param situation - * a {@link forge.card.trigger.ZCTrigger} object. + * a {@link forge.game.trigger.ZCTrigger} object. */ public AbilityTriggered(final Card sourceCard, final Command sourceCommand, final ZCTrigger situation) { super(sourceCard, ManaCost.ZERO); diff --git a/forge-gui/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java similarity index 98% rename from forge-gui/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java rename to forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java index 15faa23acaa..47d2095120e 100644 --- a/forge-gui/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java +++ b/forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; @@ -23,12 +23,12 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Iterables; import forge.card.CardType; -import forge.card.ability.AbilityUtils; -import forge.card.cost.CostPartMana; -import forge.card.cost.CostPayment; import forge.game.Game; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.cost.CostPartMana; +import forge.game.cost.CostPayment; import forge.game.player.Player; import forge.game.zone.Zone; diff --git a/forge-gui/src/main/java/forge/card/spellability/ISpellAbility.java b/forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java similarity index 76% rename from forge-gui/src/main/java/forge/card/spellability/ISpellAbility.java rename to forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java index df3e136c73b..a184658f08b 100644 --- a/forge-gui/src/main/java/forge/card/spellability/ISpellAbility.java +++ b/forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java @@ -1,4 +1,4 @@ -package forge.card.spellability; +package forge.game.spellability; /** * Will collect here essential methods needed to hold ability on stack and resolve. diff --git a/forge-gui/src/main/java/forge/card/spellability/OptionalCost.java b/forge-gui/src/main/java/forge/game/spellability/OptionalCost.java similarity index 78% rename from forge-gui/src/main/java/forge/card/spellability/OptionalCost.java rename to forge-gui/src/main/java/forge/game/spellability/OptionalCost.java index 726cf7f1ff5..b0edf40482a 100644 --- a/forge-gui/src/main/java/forge/card/spellability/OptionalCost.java +++ b/forge-gui/src/main/java/forge/game/spellability/OptionalCost.java @@ -1,4 +1,4 @@ -package forge.card.spellability; +package forge.game.spellability; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/spellability/Spell.java b/forge-gui/src/main/java/forge/game/spellability/Spell.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/Spell.java rename to forge-gui/src/main/java/forge/game/spellability/Spell.java index 700a3787b9e..224d8dab310 100644 --- a/forge-gui/src/main/java/forge/card/spellability/Spell.java +++ b/forge-gui/src/main/java/forge/game/spellability/Spell.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; -import forge.card.cost.CostPayment; -import forge.card.staticability.StaticAbility; import forge.error.BugReporter; import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardLists; +import forge.game.cost.Cost; +import forge.game.cost.CostPayment; import forge.game.player.Player; +import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellAbility.java b/forge-gui/src/main/java/forge/game/spellability/SpellAbility.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/SpellAbility.java rename to forge-gui/src/main/java/forge/game/spellability/SpellAbility.java index 257050b28ab..4e3268ec5ac 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellAbility.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellAbility.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.EnumSet; @@ -30,16 +30,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; -import forge.card.cost.CostPartMana; -import forge.card.mana.Mana; import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.cost.CostPartMana; +import forge.game.mana.Mana; import forge.game.player.Player; import forge.util.TextUtil; @@ -438,7 +438,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * Getter for the field payCosts. *

* - * @return a {@link forge.card.cost.Cost} object. + * @return a {@link forge.game.cost.Cost} object. */ public Cost getPayCosts() { return this.payCosts; @@ -450,7 +450,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { *

* * @param abCost - * a {@link forge.card.cost.Cost} object. + * a {@link forge.game.cost.Cost} object. */ public void setPayCosts(final Cost abCost) { this.payCosts = abCost; @@ -462,7 +462,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { *

* * @param restrict - * a {@link forge.card.spellability.SpellAbilityRestriction} + * a {@link forge.game.spellability.SpellAbilityRestriction} * object. */ public void setRestrictions(final SpellAbilityRestriction restrict) { @@ -474,7 +474,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * Getter for the field restrictions. *

* - * @return a {@link forge.card.spellability.SpellAbilityRestriction} object. + * @return a {@link forge.game.spellability.SpellAbilityRestriction} object. */ public SpellAbilityRestriction getRestrictions() { return this.restrictions; @@ -497,7 +497,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { *

* * @param condition - * a {@link forge.card.spellability.SpellAbilityCondition} + * a {@link forge.game.spellability.SpellAbilityCondition} * object. * @since 1.0.15 */ @@ -510,7 +510,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * Getter for the field conditions. *

* - * @return a {@link forge.card.spellability.SpellAbilityCondition} object. + * @return a {@link forge.game.spellability.SpellAbilityCondition} object. * @since 1.0.15 */ public SpellAbilityCondition getConditions() { @@ -867,7 +867,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { *

* * @param subAbility - * a {@link forge.card.spellability.AbilitySub} object. + * a {@link forge.game.spellability.AbilitySub} object. */ public void setSubAbility(final AbilitySub subAbility) { this.subAbility = subAbility; @@ -881,7 +881,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * Getter for the field subAbility. *

* - * @return a {@link forge.card.spellability.AbilitySub} object. + * @return a {@link forge.game.spellability.AbilitySub} object. */ public AbilitySub getSubAbility() { return this.subAbility; @@ -938,7 +938,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * copy. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public SpellAbility copy() { SpellAbility clone = null; @@ -1247,7 +1247,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * findRootAbility. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public SpellAbility getRootAbility() { SpellAbility parent = this; @@ -1459,7 +1459,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * findTargetCards. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public List findTargetedCards() { // First search for targeted cards associated with current ability @@ -1529,7 +1529,7 @@ public abstract class SpellAbility extends GameObject implements ISpellAbility { * findParentsTargetedPlayer. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public SpellAbility getParentTargetingPlayer() { SpellAbility parent = this.getParent(); diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityCondition.java b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java similarity index 98% rename from forge-gui/src/main/java/forge/card/spellability/SpellAbilityCondition.java rename to forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java index 75459959636..7a2590f5ed9 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityCondition.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; @@ -24,10 +24,10 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; import forge.game.Game; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.phase.PhaseType; @@ -180,7 +180,7 @@ public class SpellAbilityCondition extends SpellAbilityVariables { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean areMet(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityRestriction.java b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/SpellAbilityRestriction.java rename to forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java index 814f6e2ccba..f9d5d66b5a5 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityRestriction.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; import java.util.Map; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; import forge.game.Game; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.phase.PhaseType; @@ -193,7 +193,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean checkZoneRestrictions(final Card c, final SpellAbility sa) { @@ -230,7 +230,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean checkTimingRestrictions(final Card c, final SpellAbility sa) { @@ -269,7 +269,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean checkActivatorRestrictions(final Card c, final SpellAbility sa) { @@ -304,7 +304,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean canPlay(final Card c, final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java rename to forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java index b5cde0eb151..ea4589387d8 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import forge.card.trigger.TriggerType; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.trigger.TriggerType; /** *

@@ -83,7 +83,7 @@ public class SpellAbilityStackInstance { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public SpellAbilityStackInstance(final SpellAbility sa) { // Base SA info @@ -132,7 +132,7 @@ public class SpellAbilityStackInstance { * getSpellAbility. *

* - * @return a {@link forge.card.spellability.SpellAbility} object. + * @return a {@link forge.game.spellability.SpellAbility} object. */ public final SpellAbility getSpellAbility() { this.ability.resetTargets(); diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityVariables.java b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java similarity index 99% rename from forge-gui/src/main/java/forge/card/spellability/SpellAbilityVariables.java rename to forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java index 2b3a6ef7790..d530e2f1dd7 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellAbilityVariables.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/card/spellability/SpellPermanent.java b/forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java similarity index 96% rename from forge-gui/src/main/java/forge/card/spellability/SpellPermanent.java rename to forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java index a192d2cf4e7..72ebc5477a3 100644 --- a/forge-gui/src/main/java/forge/card/spellability/SpellPermanent.java +++ b/forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.security.InvalidParameterException; import java.util.HashMap; @@ -26,24 +26,24 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Iterables; -import forge.card.ability.AbilityFactory; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; +import forge.ai.ComputerUtilMana; import forge.card.mana.ManaCost; -import forge.card.replacement.ReplaceMoved; -import forge.card.replacement.ReplacementEffect; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GlobalRuleChange; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCost; -import forge.game.ai.ComputerUtilMana; +import forge.game.ability.AbilityFactory; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; +import forge.game.cost.Cost; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.replacement.ReplaceMoved; +import forge.game.replacement.ReplacementEffect; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/spellability/TargetChoices.java b/forge-gui/src/main/java/forge/game/spellability/TargetChoices.java similarity index 98% rename from forge-gui/src/main/java/forge/card/spellability/TargetChoices.java rename to forge-gui/src/main/java/forge/game/spellability/TargetChoices.java index 9a8ecebf0f4..642f85a44c1 100644 --- a/forge-gui/src/main/java/forge/card/spellability/TargetChoices.java +++ b/forge-gui/src/main/java/forge/game/spellability/TargetChoices.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; @@ -116,7 +116,7 @@ public class TargetChoices implements Cloneable { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ private final boolean addTarget(final SpellAbility sa) { diff --git a/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java b/forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java similarity index 97% rename from forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java rename to forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java index 0ce235c58c9..0d1842cb55e 100644 --- a/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java +++ b/forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.Arrays; @@ -25,9 +25,9 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import forge.card.CardType; -import forge.card.ability.AbilityUtils; import forge.game.Game; import forge.game.GameObject; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; import forge.game.zone.ZoneType; @@ -84,7 +84,7 @@ public class TargetRestrictions { *

* * @param target - * a {@link forge.card.spellability.TargetRestrictions} object. + * a {@link forge.game.spellability.TargetRestrictions} object. */ public TargetRestrictions(final TargetRestrictions target) { this.tgtValid = true; @@ -212,7 +212,7 @@ public class TargetRestrictions { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a int. */ public final int getMinTargets(final Card c, final SpellAbility sa) { @@ -227,7 +227,7 @@ public class TargetRestrictions { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a int. */ public final int getMaxTargets(final Card c, final SpellAbility sa) { @@ -242,7 +242,7 @@ public class TargetRestrictions { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean isMaxTargetsChosen(final Card c, final SpellAbility sa) { @@ -258,7 +258,7 @@ public class TargetRestrictions { * @param c * a {@link forge.game.card.Card} object. * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. */ public final boolean isMinTargetsChosen(final Card c, final SpellAbility sa) { @@ -560,7 +560,7 @@ public class TargetRestrictions { * copy. *

* - * @return a {@link forge.card.spellability.TargetRestrictions} object. + * @return a {@link forge.game.spellability.TargetRestrictions} object. */ public TargetRestrictions copy() { TargetRestrictions clone = null; diff --git a/forge-gui/src/main/java/forge/card/spellability/TargetSelection.java b/forge-gui/src/main/java/forge/game/spellability/TargetSelection.java similarity index 99% rename from forge-gui/src/main/java/forge/card/spellability/TargetSelection.java rename to forge-gui/src/main/java/forge/game/spellability/TargetSelection.java index 989043da74a..bb25e34c688 100644 --- a/forge-gui/src/main/java/forge/card/spellability/TargetSelection.java +++ b/forge-gui/src/main/java/forge/game/spellability/TargetSelection.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.spellability; +package forge.game.spellability; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/spellability/package-info.java b/forge-gui/src/main/java/forge/game/spellability/package-info.java new file mode 100644 index 00000000000..d676566e1ca --- /dev/null +++ b/forge-gui/src/main/java/forge/game/spellability/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.game.spellability; + diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbility.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbility.java similarity index 99% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbility.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbility.java index 7106afba073..d203f7aa5fd 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbility.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbility.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; import java.util.List; import java.util.Map; import forge.card.MagicColor; -import forge.card.ability.AbilityUtils; -import forge.card.cost.Cost; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.SpellAbility; import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.cost.Cost; +import forge.game.mana.ManaCostBeingPaid; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantAttackBlock.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java similarity index 95% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantAttackBlock.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java index 4763ed066d8..d51f9949b34 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantAttackBlock.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.game.GameEntity; import forge.game.card.Card; +import forge.game.cost.Cost; /** * The Class StaticAbility_CantBeCast. diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java similarity index 98% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java index bcb9a622ff7..d36ff9fdc72 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java similarity index 94% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java index 3fb3e301842..575b6541377 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java similarity index 98% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityContinuous.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 71c7a269630..559b408981d 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityContinuous.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.ArrayList; import java.util.Arrays; @@ -27,24 +27,24 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; import forge.card.CardType; -import forge.card.TriggerReplacementBase; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.replacement.ReplacementEffect; -import forge.card.replacement.ReplacementHandler; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; import forge.game.Game; import forge.game.GlobalRuleChange; import forge.game.StaticEffect; import forge.game.StaticEffects; +import forge.game.TriggerReplacementBase; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.replacement.ReplacementHandler; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCostChange.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java similarity index 95% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityCostChange.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java index 7d1b911804c..09da2d6bf35 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityCostChange.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; import java.util.List; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostShard; -import forge.card.spellability.AbilityActivated; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.card.Card; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.AbilityActivated; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; /** diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityETBTapped.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java similarity index 94% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityETBTapped.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java index c05fcd3beee..230abd3165e 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityETBTapped.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityMayLookAt.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java similarity index 95% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityMayLookAt.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java index 780565812e8..f5400eb1007 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityMayLookAt.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; diff --git a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java similarity index 99% rename from forge-gui/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java rename to forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java index 3ed6528218d..459c0ec0e1a 100644 --- a/forge-gui/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java +++ b/forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.staticability; +package forge.game.staticability; import java.util.HashMap; diff --git a/forge-gui/src/main/java/forge/game/staticability/package-info.java b/forge-gui/src/main/java/forge/game/staticability/package-info.java new file mode 100644 index 00000000000..d32bb9c6e75 --- /dev/null +++ b/forge-gui/src/main/java/forge/game/staticability/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.game.staticability; + diff --git a/forge-gui/src/main/java/forge/card/trigger/Trigger.java b/forge-gui/src/main/java/forge/game/trigger/Trigger.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/Trigger.java rename to forge-gui/src/main/java/forge/game/trigger/Trigger.java index 142ea28a02c..6180270ee6a 100644 --- a/forge-gui/src/main/java/forge/card/trigger/Trigger.java +++ b/forge-gui/src/main/java/forge/game/trigger/Trigger.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.card.TriggerReplacementBase; -import forge.card.spellability.Ability; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.TriggerReplacementBase; import forge.game.card.Card; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; /** @@ -349,7 +349,7 @@ public abstract class Trigger extends TriggerReplacementBase { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public abstract void setTriggeringObjects(SpellAbility sa); diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAlways.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java similarity index 95% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAlways.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java index e3bbc893b5b..abafcdbd36e 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAlways.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAttached.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAttached.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java index a901a25693a..4a1adceece3 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAttached.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java index 3282882e361..748874a253d 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.List; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java index cc0bf2c4f95..b5f52b5d7c6 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java index e3a8986c479..a3988de5e50 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.List; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.GameEntity; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerAttacks.java b/forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerAttacks.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java index a78e5b41474..f0a7cccb556 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerAttacks.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.List; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerBecomeMonstrous.java b/forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerBecomeMonstrous.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java index da8c2bf5e65..dd14a620e68 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerBecomeMonstrous.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerBecomesTarget.java b/forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerBecomesTarget.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java index ceac4976a41..193c89f0fb7 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerBecomesTarget.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerBlockersDeclared.java b/forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java similarity index 92% rename from forge-gui/src/main/java/forge/card/trigger/TriggerBlockersDeclared.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java index ceae701b04e..23d9ed07878 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerBlockersDeclared.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerBlocks.java b/forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerBlocks.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java index 93f4c21f4eb..8adc657f6fd 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerBlocks.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerChampioned.java b/forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerChampioned.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java index c3b476187cc..b6b90940c39 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerChampioned.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerChangesController.java b/forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerChangesController.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java index 68652ca825c..8904523f88e 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerChangesController.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerChangesZone.java b/forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerChangesZone.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java index 4666a6d5a0a..81fe0746047 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerChangesZone.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.spellability.SpellAbility; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.util.Expressions; /** diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerClashed.java b/forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerClashed.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java index 84e747fb549..d92ba147a68 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerClashed.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerCombatDamageDoneOnce.java b/forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerCombatDamageDoneOnce.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java index 77cf12efe03..77aa1c393f8 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerCombatDamageDoneOnce.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.GameEntity; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerCounterAdded.java b/forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerCounterAdded.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java index f62ef5b3534..d87e07c0613 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerCounterAdded.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerCounterRemoved.java b/forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerCounterRemoved.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java index 6597cfda42b..798e8e4328b 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerCounterRemoved.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.card.CounterType; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerCountered.java b/forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerCountered.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java index 8aedc254399..d92c19bdc89 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerCountered.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerCycled.java b/forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerCycled.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java index 8838af54027..ec58bfc6d82 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerCycled.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerDamageDone.java b/forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java similarity index 98% rename from forge-gui/src/main/java/forge/card/trigger/TriggerDamageDone.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java index 67ee77ef4ba..53977ff5503 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerDamageDone.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.util.Expressions; /** diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerDestroyed.java b/forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerDestroyed.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java index 2a765fa9473..f9be30ccf5d 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerDestroyed.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerDevoured.java b/forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerDevoured.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java index 717529ff217..bdaf0c7969a 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerDevoured.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerDiscarded.java b/forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerDiscarded.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java index fe3264d99ad..49a6bf1dde0 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerDiscarded.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerDrawn.java b/forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerDrawn.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java index 5a556e9e624..f6d07ec2a21 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerDrawn.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerEvolved.java b/forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerEvolved.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java index 7c92f16b3cc..c719d425f78 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerEvolved.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerFlippedCoin.java b/forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerFlippedCoin.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java index c1ce118d0be..53c0ecacb13 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerFlippedCoin.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerHandler.java b/forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerHandler.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java index 38c6db593dd..97cf7a78f16 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.ArrayList; import java.util.EnumSet; @@ -23,22 +23,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; -import forge.card.ability.ApiType; -import forge.card.ability.effects.CharmEffect; +import forge.ai.ComputerUtil; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; -import forge.card.spellability.TargetSelection; import forge.game.Game; import forge.game.GlobalRuleChange; -import forge.game.ai.ComputerUtil; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; +import forge.game.ability.ApiType; +import forge.game.ability.effects.CharmEffect; import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.HumanPlay; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.TargetSelection; import forge.game.zone.ZoneType; public class TriggerHandler { diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerLandPlayed.java b/forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerLandPlayed.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java index fb2a28670b6..236a93c7cb2 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerLandPlayed.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerLifeGained.java b/forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerLifeGained.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java index dbc41760062..f45364ed992 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerLifeGained.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerLifeLost.java b/forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerLifeLost.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java index 4b1df61749f..fc1ccbfcb17 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerLifeLost.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerLosesGame.java b/forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java similarity index 90% rename from forge-gui/src/main/java/forge/card/trigger/TriggerLosesGame.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java index 8f34209e206..a148657984c 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerLosesGame.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java @@ -1,7 +1,7 @@ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerNewGame.java b/forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java similarity index 92% rename from forge-gui/src/main/java/forge/card/trigger/TriggerNewGame.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java index d5ad4ea4e74..2147efbb29d 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerNewGame.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerPayCumulativeUpkeep.java b/forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java similarity index 94% rename from forge-gui/src/main/java/forge/card/trigger/TriggerPayCumulativeUpkeep.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java index b7f86122e8b..b79ba3bb93c 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerPayCumulativeUpkeep.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerPhase.java b/forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerPhase.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java index bd1bf2d5ced..d8e85aa79c6 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerPhase.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerPlanarDice.java b/forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java similarity index 92% rename from forge-gui/src/main/java/forge/card/trigger/TriggerPlanarDice.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java index 67a34d22bec..23adfb0bc69 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerPlanarDice.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java @@ -1,10 +1,10 @@ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.PlanarDice; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java b/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java similarity index 92% rename from forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java index f3428cee656..2f25e241af5 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java @@ -1,9 +1,9 @@ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java b/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java similarity index 92% rename from forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java index ec2dd87228b..3a84e1d9b85 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java @@ -1,9 +1,9 @@ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerSacrificed.java b/forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerSacrificed.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java index 5019fbb6b57..573e3e6af14 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerSacrificed.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerScry.java b/forge-gui/src/main/java/forge/game/trigger/TriggerScry.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerScry.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerScry.java index f988ddec319..f345c2f7947 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerScry.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerScry.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerSetInMotion.java b/forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerSetInMotion.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java index f8e57f81017..2f27a5f3607 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerSetInMotion.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerShuffled.java b/forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerShuffled.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java index fbc5e00b624..b491aefa6f6 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerShuffled.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java b/forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java index cb650180be9..a3d986cbd90 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.cost.Cost; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetChoices; import forge.game.Game; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerTaps.java b/forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerTaps.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java index 100c42b6095..e19b2dff6bf 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerTaps.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerTapsForMana.java b/forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerTapsForMana.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java index 7d3cdff7570..a1760dc6965 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerTapsForMana.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.List; import forge.card.MagicColor; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerTransformed.java b/forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/TriggerTransformed.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java index adc706f5646..9e96d807d13 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerTransformed.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java b/forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java index b5f4abde866..4dfcae26468 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerType.java b/forge-gui/src/main/java/forge/game/trigger/TriggerType.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerType.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerType.java index d1703a2992e..f2af44940d2 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerType.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerType.java @@ -1,4 +1,4 @@ -package forge.card.trigger; +package forge.game.trigger; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerUnequip.java b/forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java similarity index 97% rename from forge-gui/src/main/java/forge/card/trigger/TriggerUnequip.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java index a14fbef032f..2a560683232 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerUnequip.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerUntaps.java b/forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/TriggerUntaps.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java index 69a7bee807e..adce6994c58 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerUntaps.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; /** *

diff --git a/forge-gui/src/main/java/forge/card/trigger/TriggerWaiting.java b/forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java similarity index 91% rename from forge-gui/src/main/java/forge/card/trigger/TriggerWaiting.java rename to forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java index 6e44e9e3bdc..04cc64ad6ee 100644 --- a/forge-gui/src/main/java/forge/card/trigger/TriggerWaiting.java +++ b/forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java @@ -1,4 +1,4 @@ -package forge.card.trigger; +package forge.game.trigger; import java.util.Map; diff --git a/forge-gui/src/main/java/forge/card/trigger/WrappedAbility.java b/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java similarity index 93% rename from forge-gui/src/main/java/forge/card/trigger/WrappedAbility.java rename to forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java index de29c225129..44b333615a9 100644 --- a/forge-gui/src/main/java/forge/card/trigger/WrappedAbility.java +++ b/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java @@ -1,23 +1,23 @@ -package forge.card.trigger; +package forge.game.trigger; import java.util.HashMap; import java.util.List; import java.util.Map; -import forge.card.ability.ApiType; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilitySub; -import forge.card.spellability.ISpellAbility; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityRestriction; -import forge.card.spellability.TargetRestrictions; -import forge.card.spellability.TargetChoices; import forge.game.Game; import forge.game.GameObject; +import forge.game.ability.ApiType; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilitySub; +import forge.game.spellability.ISpellAbility; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.TargetChoices; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiDialog; // Wrapper ability that checks the requirements again just before diff --git a/forge-gui/src/main/java/forge/card/trigger/ZCTrigger.java b/forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java similarity index 96% rename from forge-gui/src/main/java/forge/card/trigger/ZCTrigger.java rename to forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java index 23fa49e2e6f..301982e1827 100644 --- a/forge-gui/src/main/java/forge/card/trigger/ZCTrigger.java +++ b/forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.card.trigger; +package forge.game.trigger; /** *

@@ -84,7 +84,7 @@ public enum ZCTrigger { * * @param description * a {@link java.lang.String} object. - * @return a {@link forge.card.trigger.ZCTrigger} object. + * @return a {@link forge.game.trigger.ZCTrigger} object. */ public static ZCTrigger getTrigger(final String description) { for (final ZCTrigger t : ZCTrigger.values()) { diff --git a/forge-gui/src/main/java/forge/game/trigger/package-info.java b/forge-gui/src/main/java/forge/game/trigger/package-info.java new file mode 100644 index 00000000000..2df7af6f310 --- /dev/null +++ b/forge-gui/src/main/java/forge/game/trigger/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.game.trigger; + diff --git a/forge-gui/src/main/java/forge/game/zone/MagicStack.java b/forge-gui/src/main/java/forge/game/zone/MagicStack.java index 72c626f8f4d..1002e0fa111 100644 --- a/forge-gui/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-gui/src/main/java/forge/game/zone/MagicStack.java @@ -33,33 +33,21 @@ import com.google.common.collect.Lists; import forge.FThreads; import forge.Singletons; -import forge.card.ability.AbilityFactory; -import forge.card.ability.AbilityUtils; +import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCard; import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability; -import forge.card.spellability.AbilityStatic; -import forge.card.spellability.AbilityTriggered; -import forge.card.spellability.OptionalCost; -import forge.card.spellability.Spell; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbilityStackInstance; -import forge.card.spellability.TargetRestrictions; -import forge.card.spellability.TargetChoices; -import forge.card.spellability.TargetSelection; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameLogEntryType; import forge.game.GameObject; -import forge.game.ai.ComputerUtil; -import forge.game.ai.ComputerUtilCard; +import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardPredicates.Presets; +import forge.game.cost.Cost; import forge.game.event.GameEventCardStatsChanged; import forge.game.event.GameEventSpellAbilityCast; import forge.game.event.GameEventSpellRemovedFromStack; @@ -67,6 +55,18 @@ import forge.game.event.GameEventSpellResolved; import forge.game.player.HumanPlay; import forge.game.player.Player; import forge.game.player.PlayerController.ManaPaymentPurpose; +import forge.game.spellability.Ability; +import forge.game.spellability.AbilityStatic; +import forge.game.spellability.AbilityTriggered; +import forge.game.spellability.OptionalCost; +import forge.game.spellability.Spell; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.SpellAbilityStackInstance; +import forge.game.spellability.TargetChoices; +import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.TargetSelection; +import forge.game.trigger.Trigger; +import forge.game.trigger.TriggerType; import forge.gui.GuiChoose; import forge.gui.input.InputSelectCards; import forge.gui.input.InputSelectCardsFromList; @@ -172,7 +172,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable * * @param ability - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void addAndUnfreeze(final SpellAbility ability) { ability.getRestrictions().abilityActivated(); @@ -277,7 +277,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable * * @param sp - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. */ public final void add(final SpellAbility sp) { FThreads.assertExecutedByEdt(false); @@ -648,7 +648,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable * * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param source * a {@link forge.game.card.Card} object. * @return a boolean. diff --git a/forge-gui/src/main/java/forge/game/zone/PlayerZone.java b/forge-gui/src/main/java/forge/game/zone/PlayerZone.java index 598b326482f..66637130c6d 100644 --- a/forge-gui/src/main/java/forge/game/zone/PlayerZone.java +++ b/forge-gui/src/main/java/forge/game/zone/PlayerZone.java @@ -23,9 +23,9 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.util.Lang; /** diff --git a/forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java index 16d7cec429d..df57ce7cd8c 100644 --- a/forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java +++ b/forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java @@ -24,12 +24,12 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.staticability.StaticAbility; -import forge.card.trigger.ZCTrigger; import forge.game.GameActionUtil; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.staticability.StaticAbility; +import forge.game.trigger.ZCTrigger; /** *

diff --git a/forge-gui/src/main/java/forge/gui/DualListBox.java b/forge-gui/src/main/java/forge/gui/DualListBox.java index 9da403ddd85..14633498c42 100644 --- a/forge-gui/src/main/java/forge/gui/DualListBox.java +++ b/forge-gui/src/main/java/forge/gui/DualListBox.java @@ -23,8 +23,8 @@ import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.spellability.SpellAbility; import forge.gui.match.CMatchUI; import forge.gui.toolbox.FButton; import forge.gui.toolbox.FLabel; diff --git a/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java b/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java index 59fb55fd833..2a3d11ce084 100644 --- a/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java +++ b/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java @@ -38,9 +38,6 @@ import com.google.common.collect.Lists; import forge.Singletons; import forge.card.CardCharacteristicName; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; -import forge.card.trigger.TriggerType; import forge.game.Game; import forge.game.GameType; import forge.game.PlanarDice; @@ -51,6 +48,9 @@ import forge.game.card.CounterType; import forge.game.phase.PhaseType; import forge.game.player.HumanPlay; import forge.game.player.Player; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; +import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCardsFromList; import forge.item.IPaperCard; diff --git a/forge-gui/src/main/java/forge/gui/InputProxy.java b/forge-gui/src/main/java/forge/gui/InputProxy.java index 324451a1ac6..d5d5c25c976 100644 --- a/forge-gui/src/main/java/forge/gui/InputProxy.java +++ b/forge-gui/src/main/java/forge/gui/InputProxy.java @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicReference; import forge.FThreads; import forge.Singletons; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.input.Input; /** diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java index 9f0d05d2402..91305e13c08 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java @@ -15,10 +15,10 @@ import org.apache.commons.lang3.tuple.Pair; import forge.Command; import forge.Constant.Preferences; import forge.Singletons; +import forge.ai.AiProfileUtil; import forge.control.FControl.CloseAction; import forge.control.RestartUtil; import forge.game.GameLogEntryType; -import forge.game.ai.AiProfileUtil; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.gui.toolbox.FComboBox; diff --git a/forge-gui/src/main/java/forge/gui/input/Input.java b/forge-gui/src/main/java/forge/gui/input/Input.java index 1d8a99317c9..09a703e8d7a 100644 --- a/forge-gui/src/main/java/forge/gui/input/Input.java +++ b/forge-gui/src/main/java/forge/gui/input/Input.java @@ -2,9 +2,9 @@ package forge.gui.input; import java.awt.event.MouseEvent; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/input/InputAttack.java b/forge-gui/src/main/java/forge/gui/input/InputAttack.java index e186ec17a59..a89d737cc9d 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/gui/input/InputAttack.java @@ -22,8 +22,8 @@ import java.util.List; import com.google.common.collect.Iterables; -import forge.card.ability.AbilityUtils; import forge.game.GameEntity; +import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardPredicates; import forge.game.combat.AttackingBand; diff --git a/forge-gui/src/main/java/forge/gui/input/InputBase.java b/forge-gui/src/main/java/forge/gui/input/InputBase.java index b3ce64ec262..4edaeee8e45 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputBase.java +++ b/forge-gui/src/main/java/forge/gui/input/InputBase.java @@ -19,11 +19,11 @@ package forge.gui.input; import java.awt.event.MouseEvent; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.phase.PhaseHandler; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.framework.SDisplayUtil; import forge.gui.match.CMatchUI; import forge.gui.match.views.VMessage; diff --git a/forge-gui/src/main/java/forge/gui/input/InputLockUI.java b/forge-gui/src/main/java/forge/gui/input/InputLockUI.java index e4c24670a8d..b72552e18e9 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputLockUI.java +++ b/forge-gui/src/main/java/forge/gui/input/InputLockUI.java @@ -5,10 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger; import forge.FThreads; import forge.Singletons; -import forge.card.spellability.SpellAbility; import forge.control.InputQueue; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.gui.match.CMatchUI; import forge.util.ThreadUtil; import forge.view.ButtonUtil; diff --git a/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java b/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java index b84b5785922..99238bd106c 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java @@ -20,9 +20,9 @@ package forge.gui.input; import java.awt.event.MouseEvent; import java.util.List; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.view.ButtonUtil; /** diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayMana.java b/forge-gui/src/main/java/forge/gui/input/InputPayMana.java index 9563e8724e0..9b8369759fc 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayMana.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayMana.java @@ -10,17 +10,17 @@ import org.apache.commons.lang3.StringUtils; import forge.FThreads; import forge.card.ColorSet; import forge.card.MagicColor; -import forge.card.ability.ApiType; -import forge.card.mana.ManaCostBeingPaid; import forge.card.mana.ManaCostShard; -import forge.card.replacement.ReplacementEffect; -import forge.card.spellability.AbilityManaPart; -import forge.card.spellability.SpellAbility; import forge.game.Game; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardUtil; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.HumanPlay; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; +import forge.game.spellability.AbilityManaPart; +import forge.game.spellability.SpellAbility; import forge.gui.GuiChoose; import forge.view.ButtonUtil; @@ -88,12 +88,12 @@ public abstract class InputPayMana extends InputSyncronizedBase { *

* * @param sa - * a {@link forge.card.spellability.SpellAbility} object. + * a {@link forge.game.spellability.SpellAbility} object. * @param card * a {@link forge.game.card.Card} object. * @param manaCost - * a {@link forge.card.mana.ManaCostBeingPaid} object. - * @return a {@link forge.card.mana.ManaCostBeingPaid} object. + * a {@link forge.game.mana.ManaCostBeingPaid} object. + * @return a {@link forge.game.mana.ManaCostBeingPaid} object. */ protected void activateManaAbility(final Card card, ManaCostBeingPaid manaCost) { // make sure computer's lands aren't selected diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java index e559ac58229..016bede8fcb 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java @@ -17,11 +17,11 @@ */ package forge.gui.input; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.SpellAbility; +import forge.game.cost.Cost; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; //if cost is paid, Command.execute() is called diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java index 6a5ae3f75a0..dcd7c6a6a0f 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java @@ -1,9 +1,9 @@ package forge.gui.input; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; public class InputPayManaOfCostPayment extends InputPayMana { diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java index 3e8fc757510..bcf693b41dd 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java @@ -17,11 +17,11 @@ */ package forge.gui.input; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; +import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.view.ButtonUtil; //pays the cost of a card played from the player's hand diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java index 069cbfe5115..483cd4df3e3 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java @@ -7,9 +7,9 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import forge.card.ColorSet; -import forge.card.mana.ManaCostBeingPaid; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; +import forge.game.mana.ManaCostBeingPaid; +import forge.game.spellability.SpellAbility; import forge.view.ButtonUtil; public class InputPayManaX extends InputPayMana { diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java index 432bc1ea272..90875ccfbad 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import forge.card.ability.ApiType; -import forge.card.spellability.SpellAbility; -import forge.card.spellability.TargetRestrictions; import forge.game.GameEntity; +import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; +import forge.game.spellability.TargetRestrictions; import forge.gui.GuiChoose; import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; diff --git a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java b/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java index cd43d0bdcdf..d1b49afd16f 100644 --- a/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java +++ b/forge-gui/src/main/java/forge/gui/match/nonsingleton/CField.java @@ -27,12 +27,12 @@ import com.google.common.base.Function; import forge.Command; import forge.Singletons; import forge.Constant.Preferences; -import forge.card.spellability.SpellAbility; import forge.game.Game; import forge.game.card.Card; import forge.game.player.HumanPlay; import forge.game.player.LobbyPlayer; import forge.game.player.Player; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.ForgeAction.MatchConstants; import forge.gui.framework.ICDoc; diff --git a/forge-gui/src/main/java/forge/gui/match/views/VStack.java b/forge-gui/src/main/java/forge/gui/match/views/VStack.java index d3ab9292827..82c3be1b82f 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VStack.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VStack.java @@ -32,10 +32,10 @@ import javax.swing.border.Border; import javax.swing.border.EmptyBorder; import net.miginfocom.swing.MigLayout; -import forge.card.spellability.SpellAbilityStackInstance; import forge.game.card.CardUtil; import forge.game.player.LobbyPlayer; import forge.game.player.PlayerController; +import forge.game.spellability.SpellAbilityStackInstance; import forge.game.zone.MagicStack; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java index 0ea47c11f75..c801ecadb17 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java @@ -19,7 +19,7 @@ import com.google.common.base.Function; import forge.Constant.Preferences; import forge.card.MagicColor; -import forge.card.mana.ManaPool; +import forge.game.mana.ManaPool; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.ForgeAction; diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 1099a3da98d..5f9d2a7dfcf 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -27,11 +27,11 @@ import java.util.List; import forge.Constant; import forge.Constant.Preferences; import forge.Singletons; +import forge.ai.AiProfileUtil; import forge.card.CardBlock; import forge.card.CardType; import forge.error.ExceptionHandler; import forge.game.GameFormat; -import forge.game.ai.AiProfileUtil; import forge.game.limited.GauntletMini; import forge.gauntlet.GauntletData; import forge.properties.ForgePreferences; diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java index b49dde23aa5..e4f68911db1 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java @@ -21,9 +21,9 @@ import java.util.List; import forge.Constant; import forge.Constant.Preferences; +import forge.ai.AiProfileUtil; import forge.control.FControl.CloseAction; import forge.game.GameLogEntryType; -import forge.game.ai.AiProfileUtil; import forge.gui.home.EMenuItem; import forge.gui.match.VMatchUI; import forge.gui.match.nonsingleton.VField; diff --git a/forge-gui/src/main/java/forge/sound/EventVisualizer.java b/forge-gui/src/main/java/forge/sound/EventVisualizer.java index b311334aa1e..58222fbceda 100644 --- a/forge-gui/src/main/java/forge/sound/EventVisualizer.java +++ b/forge-gui/src/main/java/forge/sound/EventVisualizer.java @@ -2,7 +2,6 @@ package forge.sound; import java.util.Collection; -import forge.card.spellability.SpellAbility; import forge.game.card.Card; import forge.game.event.GameEventBlockersDeclared; import forge.game.event.GameEventCardChangeZone; @@ -24,6 +23,7 @@ import forge.game.event.GameEventShuffle; import forge.game.event.GameEventSpellResolved; import forge.game.event.GameEventTokenCreated; import forge.game.event.IGameEventVisitor; +import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.events.IUiEventVisitor; import forge.gui.events.UiEventAttackerDeclared; diff --git a/forge-gui/src/test/java/forge/card/mana/ManaPartTest.java b/forge-gui/src/test/java/forge/card/mana/ManaPartTest.java index 0d56311c165..a134aa40bc5 100644 --- a/forge-gui/src/test/java/forge/card/mana/ManaPartTest.java +++ b/forge-gui/src/test/java/forge/card/mana/ManaPartTest.java @@ -4,6 +4,8 @@ import org.testng.annotations.Test; import forge.card.MagicColor; import forge.game.card.Card; +import forge.game.mana.Mana; +import forge.game.mana.ManaCostBeingPaid; /** *

@@ -462,7 +464,7 @@ public class ManaPartTest { * @param b * a boolean. * @param p - * a {@link forge.card.mana.ManaCostBeingPaid} object. + * a {@link forge.game.mana.ManaCostBeingPaid} object. */ void check(final double n, final boolean b, final ManaCostBeingPaid p) { if (!b) {