Renamed "forge.gui.input" package to "forge.control.input" for consistency and clarity.

.gitattributes

@@ -11161,6 +11161,18 @@ src/main/java/forge/control/home/ControlSealed.java -text
 src/main/java/forge/control/home/ControlSettings.java -text
 src/main/java/forge/control/home/ControlUtilities.java -text
 src/main/java/forge/control/home/package-info.java -text svneol=native#text/plain
+src/main/java/forge/control/input/Input.java svneol=native#text/plain
+src/main/java/forge/control/input/InputAttack.java svneol=native#text/plain
+src/main/java/forge/control/input/InputBlock.java svneol=native#text/plain
+src/main/java/forge/control/input/InputCleanup.java svneol=native#text/plain
+src/main/java/forge/control/input/InputControl.java svneol=native#text/plain
+src/main/java/forge/control/input/InputMana.java -text
+src/main/java/forge/control/input/InputMulligan.java svneol=native#text/plain
+src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain
+src/main/java/forge/control/input/InputPayManaCost.java svneol=native#text/plain
+src/main/java/forge/control/input/InputPayManaCostAbility.java svneol=native#text/plain
+src/main/java/forge/control/input/InputPayManaCostUtil.java svneol=native#text/plain
+src/main/java/forge/control/input/package-info.java svneol=native#text/plain
 src/main/java/forge/control/match/ControlDetail.java -text
 src/main/java/forge/control/match/ControlDock.java -text
 src/main/java/forge/control/match/ControlField.java -text
@@ -11242,18 +11254,6 @@ src/main/java/forge/gui/game/CardDetailPanel.java svneol=native#text/plain
 src/main/java/forge/gui/game/CardPanel.java svneol=native#text/plain
 src/main/java/forge/gui/game/CardPicturePanel.java svneol=native#text/plain
 src/main/java/forge/gui/game/package-info.java svneol=native#text/plain
-src/main/java/forge/gui/input/Input.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputAttack.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputBlock.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputCleanup.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputControl.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputMana.java -text
-src/main/java/forge/gui/input/InputMulligan.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputPassPriority.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputPayManaCost.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/plain
-src/main/java/forge/gui/input/InputPayManaCostUtil.java svneol=native#text/plain
-src/main/java/forge/gui/input/package-info.java svneol=native#text/plain
 src/main/java/forge/gui/package-info.java svneol=native#text/plain
 src/main/java/forge/item/BoosterPack.java -text
 src/main/java/forge/item/CardDb.java -text

src/main/java/forge/AllZone.java

@@ -26,9 +26,9 @@ import forge.card.cardfactory.CardFactoryInterface;
 import forge.card.cardfactory.PreloadingCardFactory;
 import forge.card.replacement.ReplacementHandler;
 import forge.card.trigger.TriggerHandler;
+import forge.control.input.InputControl;
 import forge.deck.DeckManager;
 import forge.game.limited.CardRatings;
-import forge.gui.input.InputControl;
 import forge.model.FGameState;
 import forge.model.FMatchState;
 import forge.properties.ForgeProps;
@@ -367,14 +367,14 @@ public final class AllZone {
      * getInputControl.
      * </p>
      * 
-     * @return a {@link forge.gui.input.InputControl} object.
+     * @return a {@link forge.control.input.InputControl} object.
      * @since 1.0.15
      */
     public static InputControl getInputControl() {
         return AllZone.inputControl;
     }
 
-    /** @param i0 &emsp; {@link forge.gui.input.InputControl} */
+    /** @param i0 &emsp; {@link forge.control.input.InputControl} */
     public static void setInputControl(InputControl i0) {
         AllZone.inputControl = i0;
     }

src/main/java/forge/CardUtil.java

@@ -34,7 +34,7 @@ import forge.card.CardCharacteristics;
 import forge.card.mana.ManaCost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityList;
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;

src/main/java/forge/CombatUtil.java

@@ -31,8 +31,8 @@ import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.Ability;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
+import forge.control.input.InputPayManaCostAbility;
 import forge.gui.GuiUtils;
-import forge.gui.input.InputPayManaCostAbility;
 
 /**
  * <p>

src/main/java/forge/ComputerAIInput.java

@@ -19,7 +19,7 @@ package forge;
 
 import com.esotericsoftware.minlog.Log;
 
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>

src/main/java/forge/ComputerUtil.java

@@ -36,8 +36,8 @@ import forge.card.spellability.AbilityMana;
 import forge.card.spellability.AbilityStatic;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.control.input.InputPayManaCostUtil;
 import forge.error.ErrorViewer;
-import forge.gui.input.InputPayManaCostUtil;
 
 /**
  * <p>

src/main/java/forge/GameAction.java

@@ -46,15 +46,15 @@ import forge.card.spellability.Target;
 import forge.card.spellability.TargetSelection;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
+import forge.control.input.InputMulligan;
+import forge.control.input.InputPayManaCost;
+import forge.control.input.InputPayManaCostAbility;
+import forge.control.input.InputPayManaCostUtil;
 import forge.deck.Deck;
 import forge.game.GameEndReason;
 import forge.game.GameSummary;
 import forge.game.GameType;
 import forge.gui.GuiUtils;
-import forge.gui.input.InputMulligan;
-import forge.gui.input.InputPayManaCost;
-import forge.gui.input.InputPayManaCostAbility;
-import forge.gui.input.InputPayManaCostUtil;
 import forge.item.CardPrinted;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;

src/main/java/forge/GameActionUtil.java

@@ -29,10 +29,10 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.InputPayManaCostAbility;
+import forge.control.input.InputPayManaCostUtil;
 import forge.game.GameLossReason;
 import forge.gui.GuiUtils;
-import forge.gui.input.InputPayManaCostAbility;
-import forge.gui.input.InputPayManaCostUtil;
 import forge.util.MyRandom;
 
 /**

src/main/java/forge/GuiInput.java

@@ -20,7 +20,7 @@ package forge;
 import java.util.Observable;
 import java.util.Observer;
 
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>
@@ -61,7 +61,7 @@ public class GuiInput extends MyObservable implements Observer {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     private void setInput(final Input in) {
         this.input = in;

src/main/java/forge/HumanPlayer.java

@@ -19,8 +19,8 @@ package forge;
 
 import forge.Constant.Zone;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * <p>

src/main/java/forge/MagicStack.java

@@ -41,9 +41,9 @@ import forge.card.spellability.Target;
 import forge.card.spellability.TargetChoices;
 import forge.card.spellability.TargetSelection;
 import forge.card.trigger.Trigger;
+import forge.control.input.Input;
+import forge.control.input.InputPayManaCostAbility;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputPayManaCostAbility;
 
 /**
  * <p>

src/main/java/forge/PlayerUtil.java

@@ -19,7 +19,7 @@ package forge;
 
 import forge.Constant.Zone;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>
@@ -69,7 +69,7 @@ public final class PlayerUtil {
      *            a {@link java.lang.String} object.
      * @param sa
      *            a {@link forge.card.spellability.SpellAbility} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputDiscardNumUnless(final int nCards, final String uType, final SpellAbility sa) {
@@ -125,7 +125,7 @@ public final class PlayerUtil {
      *            a int.
      * @param sa
      *            a {@link forge.card.spellability.SpellAbility} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputDiscard(final int nCards, final SpellAbility sa) {
@@ -171,7 +171,7 @@ public final class PlayerUtil {
      * input_chainsDiscard.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputChainsDiscard() {
         final Input target = new Input() {
@@ -213,7 +213,7 @@ public final class PlayerUtil {
      *            a {@link forge.CardList} object.
      * @param message
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputSacrificePermanent(final CardList choices, final String message) {
@@ -227,7 +227,7 @@ public final class PlayerUtil {
      * 
      * @param nCards
      *            a int.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputSacrificePermanents(final int nCards) {
@@ -244,7 +244,7 @@ public final class PlayerUtil {
      *            a int.
      * @param type
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputSacrificePermanents(final int nCards, final String type) {
@@ -265,7 +265,7 @@ public final class PlayerUtil {
      *            a {@link forge.CardList} object.
      * @param message
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputSacrificePermanentsFromList(final int nCards, final CardList list, final String message) {
@@ -314,7 +314,7 @@ public final class PlayerUtil {
      *            a {@link java.lang.String} object.
      * @param num
      *            a int.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      * @since 1.0.15
      */
     public static Input inputPutFromHandToLibrary(final String topOrBottom, final int num) {

src/main/java/forge/Untap.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 
 import forge.Constant.Zone;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>

src/main/java/forge/Upkeep.java

@@ -25,8 +25,8 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.AbilityStatic;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java

@@ -45,8 +45,8 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 import forge.util.MyRandom;
 
 /**

src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java

@@ -39,8 +39,8 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.control.input.InputPayManaCostUtil;
 import forge.gui.GuiUtils;
-import forge.gui.input.InputPayManaCostUtil;
 import forge.util.MyRandom;
 
 /**

src/main/java/forge/card/cardfactory/AbstractCardFactory.java

@@ -53,10 +53,10 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
+import forge.control.input.Input;
+import forge.control.input.InputPayManaCost;
 import forge.game.GameLossReason;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputPayManaCost;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.util.FileUtil;

src/main/java/forge/card/cardfactory/CardFactoryAuras.java

@@ -39,8 +39,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryCreatures.java

@@ -52,9 +52,9 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
+import forge.control.input.Input;
+import forge.control.input.InputPayManaCost;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputPayManaCost;
 import forge.util.MyRandom;
 
 /**

src/main/java/forge/card/cardfactory/CardFactoryLands.java

@@ -38,8 +38,8 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 import forge.util.MyRandom;
 
 /**

src/main/java/forge/card/cardfactory/CardFactorySorceries.java

@@ -48,10 +48,10 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.control.input.Input;
+import forge.control.input.InputPayManaCost;
+import forge.control.input.InputPayManaCostAbility;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputPayManaCost;
-import forge.gui.input.InputPayManaCostAbility;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryUtil.java

@@ -63,10 +63,10 @@ import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
+import forge.control.input.Input;
+import forge.control.input.InputPayManaCost;
+import forge.control.input.InputPayManaCostUtil;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputPayManaCost;
-import forge.gui.input.InputPayManaCostUtil;
 import forge.util.MyRandom;
 
 /**
@@ -794,7 +794,7 @@ public class CardFactoryUtil {
      *            a {@link forge.CardList} object.
      * @param free
      *            a boolean.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputSpell(final SpellAbility spell, final CardList choices, final boolean free) {
         final Input target = new Input() {
@@ -848,7 +848,7 @@ public class CardFactoryUtil {
      *            a {@link forge.CardList} object.
      * @param message
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputDestroyNoRegeneration(final CardList choices, final String message) {
         final Input target = new Input() {
@@ -1717,7 +1717,7 @@ public class CardFactoryUtil {
      *            a boolean.
      * @param free
      *            a boolean.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputTargetSpecific(final SpellAbility spell, final CardList choices, final String message,
             final boolean targeted, final boolean free) {
@@ -1742,7 +1742,7 @@ public class CardFactoryUtil {
      *            a boolean.
      * @param free
      *            a boolean.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputTargetSpecific(final SpellAbility spell, final CardList choices, final String message,
             final Command paid, final boolean targeted, final boolean free) {
@@ -1799,7 +1799,7 @@ public class CardFactoryUtil {
      *            a boolean.
      * @param free
      *            a boolean.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputTargetChampionSac(final Card crd, final SpellAbility spell, final CardList choices,
             final String message, final boolean targeted, final boolean free) {
@@ -1849,7 +1849,7 @@ public class CardFactoryUtil {
      * 
      * @param equip
      *            a {@link forge.card.spellability.SpellAbility} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputEquipCreature(final SpellAbility equip) {
         final Input runtime = new Input() {
@@ -1941,7 +1941,7 @@ public class CardFactoryUtil {
      *            a {@link forge.CardList} object.
      * @param paid
      *            a {@link forge.Command} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input masterOfTheWildHuntInputTargetCreature(final SpellAbility spell, final CardList choices,
             final Command paid) {
@@ -1985,7 +1985,7 @@ public class CardFactoryUtil {
      *            a {@link forge.card.spellability.SpellAbility} object.
      * @param card
      *            a {@link forge.Card} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input modularInput(final SpellAbility ability, final Card card) {
         final Input modularInput = new Input() {
@@ -3496,7 +3496,7 @@ public class CardFactoryUtil {
      *            a int.
      * @param type
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputUntapUpToNType(final int n, final String type) {
         final Input untap = new Input() {

src/main/java/forge/card/cost/CostDiscard.java

@@ -30,7 +30,7 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * The Class CostDiscard.
@@ -294,7 +294,7 @@ public class CostDiscard extends CostPartWithList {
      * @param nNeeded
      *            a int.
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputDiscardCost(final String discType, final CardList handList, final SpellAbility sa,
             final CostPayment payment, final CostDiscard part, final int nNeeded) {

src/main/java/forge/card/cost/CostExile.java

@@ -34,8 +34,8 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * The Class CostExile.
@@ -379,7 +379,7 @@ public class CostExile extends CostPartWithList {
      *            a {@link forge.card.cost.CostPayment} object.
      * @param nNeeded
      *            the n needed
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input exileType(final SpellAbility sa, final CostExile part, final String type,
             final CostPayment payment, final int nNeeded) {
@@ -463,7 +463,7 @@ public class CostExile extends CostPartWithList {
      *            a {@link forge.card.cost.CostPayment} object.
      * @param part
      *            the part
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input exileThis(final SpellAbility sa, final CostPayment payment, final CostExile part) {
         final Input target = new Input() {

src/main/java/forge/card/cost/CostMana.java

@@ -31,9 +31,9 @@ import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.mana.ManaCost;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
-import forge.gui.input.InputMana;
+import forge.control.input.InputMana;
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 /**
  * The Class CostMana.
@@ -251,7 +251,7 @@ public class CostMana extends CostPart {
      * @param numX
      *            a int.
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputPayXMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana,
             final int numX) {
@@ -352,7 +352,7 @@ public class CostMana extends CostPart {
      *            the cost mana
      * @param manaToAdd
      *            a int.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputPayMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana,
             final int manaToAdd) {

src/main/java/forge/card/cost/CostPutCounter.java

@@ -28,7 +28,7 @@ import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * The Class CostPutCounter.
@@ -243,7 +243,7 @@ public class CostPutCounter extends CostPartWithList {
      *            TODO
      * @param nNeeded
      *            the n needed
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input putCounterType(final SpellAbility sa, final String type, final CostPayment payment,
             final CostPutCounter costPutCounter, final int nNeeded) {

src/main/java/forge/card/cost/CostReturn.java

@@ -31,7 +31,7 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * The Class CostReturn.
@@ -206,7 +206,7 @@ public class CostReturn extends CostPartWithList {
      *            TODO
      * @param nNeeded
      *            the n needed
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input returnType(final SpellAbility sa, final String type, final CostPayment payment,
             final CostReturn part, final int nNeeded) {
@@ -286,7 +286,7 @@ public class CostReturn extends CostPartWithList {
      *            a {@link forge.card.cost.CostPayment} object.
      * @param part
      *            TODO
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input returnThis(final SpellAbility sa, final CostPayment payment, final CostReturn part) {
         final Input target = new Input() {

src/main/java/forge/card/cost/CostReveal.java

@@ -29,8 +29,8 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * The Class CostReveal.
@@ -226,7 +226,7 @@ public class CostReveal extends CostPartWithList {
      *            TODO
      * @param nNeeded
      *            a int.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputRevealCost(final String discType, final CardList handList, final CostPayment payment,
             final CostReveal part, final SpellAbility sa, final int nNeeded) {

src/main/java/forge/card/cost/CostSacrifice.java

@@ -31,7 +31,7 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * The Class CostSacrifice.
@@ -252,7 +252,7 @@ public class CostSacrifice extends CostPartWithList {
      *            TODO
      * @param nNeeded
      *            the n needed
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input sacrificeFromList(final SpellAbility sa, final CostPayment payment, final CostSacrifice part,
             final CardList typeList, final int nNeeded) {
@@ -329,7 +329,7 @@ public class CostSacrifice extends CostPartWithList {
      *            a {@link forge.card.cost.CostPayment} object.
      * @param part
      *            TODO
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input sacrificeThis(final SpellAbility sa, final CostPayment payment, final CostSacrifice part) {
         final Input target = new Input() {

src/main/java/forge/card/cost/CostTapType.java

@@ -29,7 +29,7 @@ import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * The Class CostTapType.
@@ -223,7 +223,7 @@ public class CostTapType extends CostPartWithList {
      *            a {@link forge.card.cost.CostPayment} object.
      * @param nCards
      *            a int.
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public static Input inputTapXCost(final CostTapType tapType, final CardList cardList, final SpellAbility sa,
             final CostPayment payment, final int nCards) {

src/main/java/forge/card/cost/CostUtil.java

@@ -27,8 +27,8 @@ import forge.Constant.Zone;
 import forge.Counters;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * The Class CostUtil.
@@ -315,7 +315,7 @@ public class CostUtil {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public static void setInput(final Input in) {
         // Just a shortcut..

src/main/java/forge/card/mana/Mana.java

@@ -19,7 +19,7 @@ package forge.card.mana;
 
 import forge.Card;
 import forge.Constant;
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 /**
  * <p>

src/main/java/forge/card/mana/ManaCost.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.StringTokenizer;
 
 import forge.Constant;
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 /**
  * <p>

src/main/java/forge/card/mana/ManaPartColor.java

@@ -17,7 +17,7 @@
  */
 package forge.card.mana;
 
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 /**
  * <p>

src/main/java/forge/card/mana/ManaPartSplit.java

@@ -17,7 +17,7 @@
  */
 package forge.card.mana;
 
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 //handles mana costs like 2/R or 2/B
 //for cards like Flame Javelin (Shadowmoor)

src/main/java/forge/card/mana/ManaPool.java

@@ -29,8 +29,8 @@ import forge.Constant;
 import forge.Player;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
+import forge.control.input.InputPayManaCostUtil;
 import forge.gui.GuiUtils;
-import forge.gui.input.InputPayManaCostUtil;
 
 /**
  * <p>

src/main/java/forge/card/spellability/SpellAbility.java

@@ -29,7 +29,7 @@ import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cost.Cost;
 import forge.card.mana.Mana;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 //only SpellAbility can go on the stack
 //override any methods as needed
@@ -613,7 +613,7 @@ public abstract class SpellAbility {
      * Getter for the field <code>beforePayMana</code>.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public Input getBeforePayMana() {
         return this.beforePayMana;
@@ -625,7 +625,7 @@ public abstract class SpellAbility {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public void setBeforePayMana(final Input in) {
         this.beforePayMana = in;
@@ -636,7 +636,7 @@ public abstract class SpellAbility {
      * Getter for the field <code>afterPayMana</code>.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public Input getAfterPayMana() {
         return this.afterPayMana;
@@ -648,7 +648,7 @@ public abstract class SpellAbility {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public void setAfterPayMana(final Input in) {
         this.afterPayMana = in;
@@ -1041,7 +1041,7 @@ public abstract class SpellAbility {
      * Getter for the field <code>afterResolve</code>.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public Input getAfterResolve() {
         return this.afterResolve;
@@ -1053,7 +1053,7 @@ public abstract class SpellAbility {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public void setAfterResolve(final Input in) {
         this.afterResolve = in;

src/main/java/forge/card/spellability/SpellPermanent.java

@@ -35,7 +35,7 @@ import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
 import forge.card.trigger.Trigger;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>

src/main/java/forge/card/spellability/TargetSelection.java

@@ -31,8 +31,8 @@ import forge.Constant.Zone;
 import forge.Player;
 import forge.PlayerZone;
 import forge.Singletons;
+import forge.control.input.Input;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
 
 /**
  * <p>
@@ -307,7 +307,7 @@ public class TargetSelection {
      *            a boolean.
      * @param alreadyTargeted
      *            the already targeted
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public final Input inputTargetSpecific(final CardList choices, final boolean targeted, final boolean mandatory,
             final ArrayList<Object> alreadyTargeted) {

src/main/java/forge/card/trigger/TriggerHandler.java

@@ -41,7 +41,7 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.Target;
-import forge.gui.input.Input;
+import forge.control.input.Input;
 
 /**
  * <p>

src/main/java/forge/control/input/Input.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.Card;
@@ -114,7 +114,7 @@ public abstract class Input implements java.io.Serializable {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public final void stopSetNext(final Input in) {
         this.stop();

src/main/java/forge/control/input/InputAttack.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.ButtonUtil;

src/main/java/forge/control/input/InputBlock.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import java.util.ArrayList;
 

src/main/java/forge/control/input/InputCleanup.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.ButtonUtil;

src/main/java/forge/control/input/InputControl.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import java.util.LinkedList;
 import java.util.Stack;
@@ -66,7 +66,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     public final void setInput(final Input in) {
         if (this.model.getGameState().getStack().getResolving()
@@ -84,7 +84,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      * @param bAddToResolving
      *            a boolean.
      */
@@ -106,7 +106,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * </p>
      * 
      * @param in
-     *            a {@link forge.gui.input.Input} object.
+     *            a {@link forge.control.input.Input} object.
      */
     private void changeInput(final Input in) {
         this.input = in;
@@ -118,7 +118,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * Getter for the field <code>input</code>.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public final Input getInput() {
         return this.input;
@@ -165,7 +165,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * updateInput.
      * </p>
      * 
-     * @return a {@link forge.gui.input.Input} object.
+     * @return a {@link forge.control.input.Input} object.
      */
     public final Input updateInput() {
         final String phase = this.model.getGameState().getPhaseHandler().getPhase();

src/main/java/forge/control/input/InputMana.java

@@ -1,4 +1,4 @@
-package forge.gui.input;
+package forge.control.input;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/control/input/InputMulligan.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import java.util.ArrayList;
 

src/main/java/forge/control/input/InputPassPriority.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.ButtonUtil;

src/main/java/forge/control/input/InputPayManaCost.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.ButtonUtil;
@@ -297,7 +297,7 @@ public class InputPayManaCost extends InputMana {
     }
 
     /* (non-Javadoc)
-     * @see forge.gui.input.InputMana#selectManaPool(String)
+     * @see forge.control.input.InputMana#selectManaPool(String)
      */
     @Override
     public void selectManaPool(String color) {

src/main/java/forge/control/input/InputPayManaCostAbility.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import forge.AllZone;
 import forge.ButtonUtil;
@@ -193,7 +193,7 @@ public class InputPayManaCostAbility extends InputMana {
     }
 
     /* (non-Javadoc)
-     * @see forge.gui.input.InputMana#selectManaPool()
+     * @see forge.control.input.InputMana#selectManaPool()
      */
     @Override
     public void selectManaPool(String color) {

src/main/java/forge/control/input/InputPayManaCostUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.gui.input;
+package forge.control.input;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/forge/control/input/package-info.java

@@ -0,0 +1,3 @@
+/** Forge Card Game. */
+package forge.control.input;
+

src/main/java/forge/control/match/ControlField.java

@@ -43,14 +43,14 @@ import forge.Player;
 import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
+import forge.control.input.Input;
+import forge.control.input.InputAttack;
+import forge.control.input.InputBlock;
+import forge.control.input.InputMana;
+import forge.control.input.InputPayManaCost;
+import forge.control.input.InputPayManaCostAbility;
 import forge.gui.ForgeAction;
 import forge.gui.GuiUtils;
-import forge.gui.input.Input;
-import forge.gui.input.InputAttack;
-import forge.gui.input.InputBlock;
-import forge.gui.input.InputMana;
-import forge.gui.input.InputPayManaCost;
-import forge.gui.input.InputPayManaCostAbility;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.properties.NewConstants.Lang.GuiDisplay.ComputerHand;

src/main/java/forge/gui/input/package-info.java

@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package forge.gui.input;
-

src/main/java/forge/model/FModel.java

@@ -33,8 +33,8 @@ import forge.ComputerAIInput;
 import forge.Constant;
 import forge.ConstantStringArrayList;
 import forge.Singletons;
+import forge.control.input.InputControl;
 import forge.game.GameSummary;
-import forge.gui.input.InputControl;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.properties.ForgeProps;

src/test/java/forge/RunTest.java

@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
 
 import forge.card.cardfactory.CardFactoryInterface;
 import forge.card.mana.ManaCost;
-import forge.gui.input.InputPayManaCostUtil;
+import forge.control.input.InputPayManaCostUtil;
 
 /**
  * <p>