move inputs to forge.gui.input

DrawEffect.java - removed isHuman, fixed description using Lang library

.gitattributes

@@ -14163,32 +14163,10 @@ src/main/java/forge/control/ChatArea.java -text
 src/main/java/forge/control/ControlBazaarUI.java -text
 src/main/java/forge/control/FControl.java -text
 src/main/java/forge/control/FControlGameEventHandler.java -text
+src/main/java/forge/control/InputQueue.java svneol=native#text/plain
 src/main/java/forge/control/KeyboardShortcuts.java -text
 src/main/java/forge/control/Lobby.java -text
 src/main/java/forge/control/RestartUtil.java -text
-src/main/java/forge/control/input/Input.java -text
-src/main/java/forge/control/input/InputAttack.java svneol=native#text/plain
-src/main/java/forge/control/input/InputBase.java svneol=native#text/plain
-src/main/java/forge/control/input/InputBlock.java svneol=native#text/plain
-src/main/java/forge/control/input/InputConfirmMulligan.java svneol=native#text/plain
-src/main/java/forge/control/input/InputLockUI.java -text
-src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain
-src/main/java/forge/control/input/InputPayMana.java -text
-src/main/java/forge/control/input/InputPayManaExecuteCommands.java svneol=native#text/plain
-src/main/java/forge/control/input/InputPayManaOfCostPayment.java -text
-src/main/java/forge/control/input/InputPayManaSimple.java svneol=native#text/plain
-src/main/java/forge/control/input/InputPayManaX.java -text
-src/main/java/forge/control/input/InputPlayOrDraw.java -text
-src/main/java/forge/control/input/InputProliferate.java -text
-src/main/java/forge/control/input/InputQueue.java svneol=native#text/plain
-src/main/java/forge/control/input/InputSelectCards.java -text
-src/main/java/forge/control/input/InputSelectCardsFromList.java -text
-src/main/java/forge/control/input/InputSelectMany.java -text
-src/main/java/forge/control/input/InputSelectManyBase.java -text
-src/main/java/forge/control/input/InputSelectTargets.java -text
-src/main/java/forge/control/input/InputSynchronized.java -text
-src/main/java/forge/control/input/InputSyncronizedBase.java -text
-src/main/java/forge/control/input/package-info.java svneol=native#text/plain
 src/main/java/forge/control/package-info.java -text
 src/main/java/forge/deck/CardCollections.java -text
 src/main/java/forge/deck/CardPool.java -text
@@ -14462,6 +14440,28 @@ src/main/java/forge/gui/home/variant/CSubmenuVanguard.java -text
 src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java -text
 src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java -text
 src/main/java/forge/gui/home/variant/VSubmenuVanguard.java -text
+src/main/java/forge/gui/input/Input.java -text
+src/main/java/forge/gui/input/InputAttack.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputBase.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputBlock.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputConfirmMulligan.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputLockUI.java -text
+src/main/java/forge/gui/input/InputPassPriority.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputPayMana.java -text
+src/main/java/forge/gui/input/InputPayManaExecuteCommands.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputPayManaOfCostPayment.java -text
+src/main/java/forge/gui/input/InputPayManaSimple.java svneol=native#text/plain
+src/main/java/forge/gui/input/InputPayManaX.java -text
+src/main/java/forge/gui/input/InputPlayOrDraw.java -text
+src/main/java/forge/gui/input/InputProliferate.java -text
+src/main/java/forge/gui/input/InputSelectCards.java -text
+src/main/java/forge/gui/input/InputSelectCardsFromList.java -text
+src/main/java/forge/gui/input/InputSelectMany.java -text
+src/main/java/forge/gui/input/InputSelectManyBase.java -text
+src/main/java/forge/gui/input/InputSelectTargets.java -text
+src/main/java/forge/gui/input/InputSynchronized.java -text
+src/main/java/forge/gui/input/InputSyncronizedBase.java -text
+src/main/java/forge/gui/input/package-info.java svneol=native#text/plain
 src/main/java/forge/gui/match/CMatchUI.java -text
 src/main/java/forge/gui/match/ControlWinLose.java -text
 src/main/java/forge/gui/match/GauntletWinLose.java -text

src/main/java/forge/card/ability/effects/ChangeZoneEffect.java

@@ -20,7 +20,6 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.card.spellability.Target;
 import forge.card.trigger.TriggerType;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.player.Player;
@@ -28,6 +27,7 @@ import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.util.Aggregates;
 import forge.util.Lang;
 

src/main/java/forge/card/ability/effects/CountersProliferateEffect.java

@@ -12,9 +12,9 @@ import forge.GameEntity;
 import forge.Singletons;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputProliferate;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputProliferate;
 
 public class CountersProliferateEffect extends SpellAbilityEffect {
     @Override

src/main/java/forge/card/ability/effects/DrawEffect.java

@@ -13,6 +13,7 @@ import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
+import forge.util.Lang;
 
 public class DrawEffect extends SpellAbilityEffect {
     @Override
@@ -23,20 +24,16 @@ public class DrawEffect extends SpellAbilityEffect {
 
         if (!tgtPlayers.isEmpty()) {
 
-            sb.append(StringUtils.join(tgtPlayers, " and "));
+            int numCards = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa) : 1;
             
-            int numCards = 1;
+            sb.append(Lang.joinHomogenous(tgtPlayers));
-            if (sa.hasParam("NumCards")) {
-                numCards = AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa);
-            }
 
             if (tgtPlayers.size() > 1) {
                 sb.append(" each");
             }
-            sb.append(" draw");
+            sb.append(Lang.joinVerb(tgtPlayers, "draw")).append(" ");
-            if (tgtPlayers.size() == 1) {
+
-                sb.append("s");
+            sb.append(numCards).append(Lang.joinNounToAmount(numCards, "card"));
-            }
             sb.append(" (").append(numCards).append(")");
 
             if (sa.hasParam("NextUpkeep")) {
@@ -52,10 +49,8 @@ public class DrawEffect extends SpellAbilityEffect {
     @Override
     public void resolve(SpellAbility sa) {
         final Card source = sa.getSourceCard();
-        int numCards = 1;
+        int numCards = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa) : 1;
-        if (sa.hasParam("NumCards")) {
+        
-            numCards = AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa);
-        }
 
         final Target tgt = sa.getTarget();
 
@@ -64,30 +59,16 @@ public class DrawEffect extends SpellAbilityEffect {
 
         for (final Player p : getDefinedPlayersBeforeTargetOnes(sa)) {
             if ((tgt == null) || p.canBeTargetedBy(sa)) {
-                if (optional) {
+                if (optional && !p.getController().confirmAction(sa, null, "Do you want to draw " + numCards + " cards(s)?"))
-                    if (p.isComputer()) {
-                        if (numCards >= p.getCardsIn(ZoneType.Library).size()) {
-                            // AI shouldn't itself
                     continue;
-                        }
-                    } else {
-                        final StringBuilder sb = new StringBuilder();
-                        sb.append("Do you want to draw ").append(numCards).append(" cards(s)");
 
-                        sb.append("?");
-
-                        if (!GuiDialog.confirm(sa.getSourceCard(), sb.toString())) {
-                            continue;
-                        }
-                    }
-                }
                 //TODO: remove this deprecation exception
                 if (slowDraw) {
                     throw new RuntimeException("This api option is no longer supported.  Please file a bug report with the card that threw this error.");
                 } else {
                     final List<Card> drawn = p.drawCards(numCards);
                     if (sa.hasParam("Reveal")) {
-                        GuiChoose.one("Revealing drawn cards", drawn);
+                        p.getGame().getAction().reveal(drawn, p);
                     }
                     if (sa.hasParam("RememberDrawn")) {
                         for (final Card c : drawn) {

src/main/java/forge/card/ability/effects/UntapEffect.java

@@ -12,11 +12,11 @@ import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 public class UntapEffect extends SpellAbilityEffect {
 

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

@@ -41,8 +41,6 @@ import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
@@ -50,6 +48,8 @@ import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.util.Aggregates;
 
 /**

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

@@ -30,15 +30,15 @@ import forge.card.cost.Cost;
 import forge.card.mana.ManaCost;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputPayManaExecuteCommands;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.AiController;
 import forge.game.player.Player;
 import forge.game.player.PlayerControllerAi;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputPayManaExecuteCommands;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * <p>

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

@@ -61,8 +61,6 @@ import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.card.trigger.TriggerType;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
@@ -73,6 +71,8 @@ import forge.game.zone.PlayerZone;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.util.Aggregates;
 
 /**

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

@@ -27,13 +27,13 @@ import forge.CardPredicates;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.AiController;
 import forge.game.player.Player;
 import forge.game.player.PlayerControllerAi;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.util.Aggregates;
 
 /**

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

@@ -27,14 +27,14 @@ import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostExile.

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

@@ -25,12 +25,12 @@ import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostBeingPaid;
 import forge.card.mana.ManaCostShard;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputPayMana;
-import forge.control.input.InputPayManaOfCostPayment;
-import forge.control.input.InputPayManaX;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilMana;
 import forge.game.player.Player;
+import forge.gui.input.InputPayMana;
+import forge.gui.input.InputPayManaOfCostPayment;
+import forge.gui.input.InputPayManaX;
 
 /**
  * The mana component of any spell or ability cost

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

@@ -27,11 +27,11 @@ import forge.CounterType;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
 
 /**
  * The Class CostPutCounter.

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

@@ -28,11 +28,11 @@ import forge.CounterType;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
 import forge.game.Game;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputSelectCards;
 
 /**
  * The Class CostRemoveCounter.

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

@@ -24,13 +24,13 @@ import forge.CardLists;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostReturn.

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

@@ -27,13 +27,13 @@ import forge.CardLists;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.AiController;
 import forge.game.player.Player;
 import forge.game.player.PlayerControllerAi;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostReveal.

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

@@ -24,13 +24,13 @@ import forge.CardLists;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostSacrifice.

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

@@ -28,12 +28,12 @@ import forge.Singletons;
 import forge.CardPredicates.Presets;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostTapType.

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

@@ -24,12 +24,12 @@ import forge.Singletons;
 import forge.CardPredicates.Presets;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * The Class CostUntapType.

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

@@ -26,12 +26,12 @@ import forge.Card;
 import forge.CardLists;
 import forge.Singletons;
 import forge.card.ability.AbilityUtils;
-import forge.control.input.InputSelectTargets;
 import forge.game.Game;
 import forge.game.player.Player;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputSelectTargets;
 import forge.util.Aggregates;
 
 /**

src/main/java/forge/control/FControl.java

@@ -37,7 +37,6 @@ import forge.Card;
 import forge.Constant.Preferences;
 import forge.Singletons;
 import forge.control.KeyboardShortcuts.Shortcut;
-import forge.control.input.InputQueue;
 import forge.game.Game;
 import forge.game.ai.AiProfileUtil;
 import forge.game.player.LobbyPlayer;

src/main/java/forge/control/InputQueue.java

@@ -15,12 +15,15 @@
  * 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.control.input;
+package forge.control;
 
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.LinkedBlockingDeque;
 
 import forge.game.Game;
+import forge.gui.input.Input;
+import forge.gui.input.InputLockUI;
+import forge.gui.input.InputSynchronized;
 import forge.util.MyObservable;
 
 /**
@@ -43,13 +46,6 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
         inputLock = new InputLockUI(this);
     }
 
-    /**
-     * <p>
-     * Getter for the field <code>input</code>.
-     * </p>
-     * 
-     * @return a {@link forge.control.input.InputBase} object.
-     */
     public final Input getInput() {
         return inputStack.isEmpty() ? null : this.inputStack.peek();
     }
@@ -62,7 +58,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
      * @param update
      *            a boolean.
      */
-    final void removeInput(Input inp) {
+    public final void removeInput(Input inp) {
         Input topMostInput = inputStack.isEmpty() ? null : inputStack.pop();
 
         if( topMostInput != inp )
@@ -75,7 +71,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
      * updateInput.
      * </p>
      * 
-     * @return a {@link forge.control.input.InputBase} object.
+     * @return a {@link forge.gui.input.InputBase} object.
      */
     public final Input getActualInput(Game game) {
         Input topMost = inputStack.peek(); // incoming input to Control

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

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

src/main/java/forge/game/ai/AiController.java

@@ -35,6 +35,7 @@ import forge.CardPredicates;
 import forge.CardPredicates.Presets;
 import forge.Constant;
 import forge.GameEntity;
+import forge.card.ability.AbilityUtils;
 import forge.card.ability.ApiType;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.CostDiscard;
@@ -740,6 +741,14 @@ public class AiController {
                 //the spell in the first place if it would curse its own creature
                 //and the pump isn't mandatory
                 return true;
+                
+            case Draw:
+                int numCards = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa) : 1;
+                // AI shouldn't mill itself
+                return numCards < player.getZone(ZoneType.Library).size();
+
+
+                
             default: 
         }
         String exMsg = String.format("AI confirmAction does not know what to decide about %s API with %s mode.", api, mode);

src/main/java/forge/game/phase/Untap.java

@@ -30,13 +30,13 @@ import forge.Singletons;
 import forge.CardPredicates.Presets;
 import forge.CounterType;
 import forge.GameEntity;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * <p>

src/main/java/forge/game/phase/Upkeep.java

@@ -37,9 +37,6 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.AbilityManaPart;
 import forge.card.spellability.AbilityStatic;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.InputPayManaExecuteCommands;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
@@ -52,6 +49,9 @@ import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputPayManaExecuteCommands;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /**
  * <p>

src/main/java/forge/game/player/HumanPlay.java

@@ -39,16 +39,16 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.HumanPlaySpellAbility;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
-import forge.control.input.InputPayMana;
-import forge.control.input.InputPayManaExecuteCommands;
-import forge.control.input.InputPayManaSimple;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.GameActionUtil;
 import forge.game.Game;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
+import forge.gui.input.InputPayMana;
+import forge.gui.input.InputPayManaExecuteCommands;
+import forge.gui.input.InputPayManaSimple;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 
 /** 
  * TODO: Write javadoc for this type.

src/main/java/forge/game/player/PlayerControllerHuman.java

@@ -19,14 +19,6 @@ import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.spellability.TargetSelection;
-import forge.control.input.InputAttack;
-import forge.control.input.InputBlock;
-import forge.control.input.InputConfirmMulligan;
-import forge.control.input.InputPassPriority;
-import forge.control.input.InputPlayOrDraw;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
-import forge.control.input.InputSynchronized;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -37,6 +29,14 @@ import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
 import forge.gui.GuiUtils;
+import forge.gui.input.InputAttack;
+import forge.gui.input.InputBlock;
+import forge.gui.input.InputConfirmMulligan;
+import forge.gui.input.InputPassPriority;
+import forge.gui.input.InputPlayOrDraw;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
+import forge.gui.input.InputSynchronized;
 import forge.gui.match.CMatchUI;
 import forge.item.CardPrinted;
 import forge.util.TextUtil;

src/main/java/forge/game/zone/MagicStack.java

@@ -50,9 +50,6 @@ import forge.card.spellability.Target;
 import forge.card.spellability.TargetChoices;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerType;
-import forge.control.input.InputPayManaExecuteCommands;
-import forge.control.input.InputSelectCards;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.GameActionUtil;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
@@ -62,6 +59,9 @@ import forge.game.event.GameEventSpellResolved;
 import forge.game.player.HumanPlay;
 import forge.game.player.Player;
 import forge.gui.GuiChoose;
+import forge.gui.input.InputPayManaExecuteCommands;
+import forge.gui.input.InputSelectCards;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.util.MyObservable;
 
 /**

src/main/java/forge/gui/GuiDisplayUtil.java

@@ -44,7 +44,6 @@ import forge.Singletons;
 import forge.card.spellability.AbilityManaPart;
 import forge.card.spellability.SpellAbility;
 import forge.card.trigger.TriggerType;
-import forge.control.input.InputSelectCardsFromList;
 import forge.game.Game;
 import forge.game.GameType;
 import forge.game.PlanarDice;
@@ -53,6 +52,7 @@ import forge.game.player.HumanPlay;
 import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
+import forge.gui.input.InputSelectCardsFromList;
 import forge.item.CardDb;
 import forge.item.CardPrinted;
 import forge.item.IPaperCard;

src/main/java/forge/gui/InputProxy.java

@@ -24,9 +24,9 @@ import java.util.concurrent.atomic.AtomicReference;
 import forge.Card;
 import forge.FThreads;
 import forge.Singletons;
-import forge.control.input.Input;
 import forge.game.Game;
 import forge.game.player.Player;
+import forge.gui.input.Input;
 
 /**
  * <p>

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

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import forge.Card;
 import forge.game.player.Player;

src/main/java/forge/gui/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.control.input;
+package forge.gui.input;
 
 import java.util.HashSet;
 import java.util.List;

src/main/java/forge/gui/input/InputBase.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.control.input;
+package forge.gui.input;
 
 import forge.Card;
 import forge.game.phase.PhaseHandler;

src/main/java/forge/gui/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.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/forge/gui/input/InputConfirmMulligan.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.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/forge/gui/input/InputLockUI.java

@@ -1,10 +1,11 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import forge.Card;
 import forge.FThreads;
 import forge.Singletons;
+import forge.control.InputQueue;
 import forge.game.player.Player;
 import forge.gui.match.CMatchUI;
 import forge.view.ButtonUtil;

src/main/java/forge/gui/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.control.input;
+package forge.gui.input;
 
 import forge.Card;
 import forge.card.spellability.SpellAbility;

src/main/java/forge/gui/input/InputPayMana.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/forge/gui/input/InputPayManaExecuteCommands.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.control.input;
+package forge.gui.input;
 
 import forge.card.cost.Cost;
 import forge.card.mana.ManaCost;

src/main/java/forge/gui/input/InputPayManaOfCostPayment.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import forge.Card;
 import forge.card.mana.ManaCostBeingPaid;

src/main/java/forge/gui/input/InputPayManaSimple.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.control.input;
+package forge.gui.input;
 
 import forge.Card;
 import forge.card.mana.ManaCostBeingPaid;

src/main/java/forge/gui/input/InputPayManaX.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/forge/gui/input/InputPlayOrDraw.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.control.input;
+package forge.gui.input;
 
 import forge.game.player.Player;
 import forge.view.ButtonUtil;

src/main/java/forge/gui/input/InputProliferate.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/forge/gui/input/InputSelectCards.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import forge.Card;
 

src/main/java/forge/gui/input/InputSelectCardsFromList.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.List;
 

src/main/java/forge/gui/input/InputSelectMany.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.List;
 

src/main/java/forge/gui/input/InputSelectManyBase.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/forge/gui/input/InputSelectTargets.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/forge/gui/input/InputSynchronized.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 public interface InputSynchronized extends Input {
     void awaitLatchRelease();

src/main/java/forge/gui/input/InputSyncronizedBase.java

@@ -1,4 +1,4 @@
-package forge.control.input;
+package forge.gui.input;
 
 import java.util.concurrent.CountDownLatch;
 

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

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

src/main/java/forge/gui/match/nonsingleton/CField.java

@@ -35,8 +35,6 @@ import forge.Singletons;
 import forge.Constant.Preferences;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
-import forge.control.input.Input;
-import forge.control.input.InputPayMana;
 import forge.game.Game;
 import forge.game.player.HumanPlay;
 import forge.game.player.LobbyPlayer;
@@ -44,6 +42,8 @@ import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.ForgeAction.MatchConstants;
 import forge.gui.framework.ICDoc;
+import forge.gui.input.Input;
+import forge.gui.input.InputPayMana;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.controllers.CMessage;
 import forge.gui.toolbox.FLabel;

src/main/java/forge/util/Lang.java

@@ -43,6 +43,16 @@ public class Lang {
         return sb.toString();
     }
     
+    public static <T> String joinVerb(List<T> subjects, String verb) {
+        // English is simple - just add (s) for multiple objects. 
+        return subjects.size() > 1 ? verb : verb + "s";
+    }
+
+    public static <T> String joinNounToAmount(int cnt, String noun) {
+        //  Simpliest check
+        return cnt > 1 ? noun : ( noun.endsWith("s") || noun.endsWith("x") ? noun + "es" : noun + "s");
+    }    
+    
     /**
      * TODO: Write javadoc for this method.
      * @param name