moved player-related stuff to a package

Removed unused classes SimpleCombat, ExternalPanel, ImagePreviewPanel, Move

.gitattributes

@@ -11346,7 +11346,6 @@ src/main/java/arcane/ui/util/package-info.java svneol=native#text/plain
 src/main/java/arcane/util/MultiplexOutputStream.java svneol=native#text/plain
 src/main/java/arcane/util/Util.java svneol=native#text/plain
 src/main/java/arcane/util/package-info.java svneol=native#text/plain
-src/main/java/forge/AIPlayer.java svneol=native#text/plain
 src/main/java/forge/AllZone.java svneol=native#text/plain
 src/main/java/forge/AllZoneUtil.java svneol=native#text/plain
 src/main/java/forge/ButtonUtil.java svneol=native#text/plain
@@ -11368,16 +11367,9 @@ src/main/java/forge/Command.java svneol=native#text/plain
 src/main/java/forge/CommandArgs.java svneol=native#text/plain
 src/main/java/forge/CommandList.java svneol=native#text/plain
 src/main/java/forge/CommandReturn.java svneol=native#text/plain
-src/main/java/forge/Computer.java svneol=native#text/plain
-src/main/java/forge/ComputerAIGeneral.java svneol=native#text/plain
-src/main/java/forge/ComputerAIInput.java svneol=native#text/plain
-src/main/java/forge/ComputerUtil.java svneol=native#text/plain
-src/main/java/forge/ComputerUtilAttack.java svneol=native#text/plain
 src/main/java/forge/ComputerUtilBlock.java svneol=native#text/plain
 src/main/java/forge/Constant.java svneol=native#text/plain
 src/main/java/forge/Counters.java svneol=native#text/plain
-src/main/java/forge/DefaultPlayerZone.java svneol=native#text/plain
-src/main/java/forge/ExternalPanel.java svneol=native#text/plain
 src/main/java/forge/GameAction.java svneol=native#text/plain
 src/main/java/forge/GameActionUtil.java svneol=native#text/plain
 src/main/java/forge/GameEntity.java -text
@@ -11389,20 +11381,10 @@ src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plai
 src/main/java/forge/GuiMultipleBlockers.java svneol=native#text/plain
 src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain
 src/main/java/forge/HandSizeOp.java svneol=native#text/plain
-src/main/java/forge/HumanPlayer.java svneol=native#text/plain
-src/main/java/forge/IPlayerZone.java svneol=native#text/plain
 src/main/java/forge/ImageCache.java svneol=native#text/plain
-src/main/java/forge/ImagePreviewPanel.java svneol=native#text/plain
 src/main/java/forge/MagicStack.java svneol=native#text/plain
-src/main/java/forge/Move.java svneol=native#text/plain
 src/main/java/forge/MyObservable.java svneol=native#text/plain
 src/main/java/forge/NameChanger.java svneol=native#text/plain
-src/main/java/forge/Player.java svneol=native#text/plain
-src/main/java/forge/PlayerType.java svneol=native#text/plain
-src/main/java/forge/PlayerUtil.java svneol=native#text/plain
-src/main/java/forge/PlayerZone.java svneol=native#text/plain
-src/main/java/forge/PlayerZoneComesIntoPlay.java svneol=native#text/plain
-src/main/java/forge/SimpleCombat.java svneol=native#text/plain
 src/main/java/forge/Singletons.java svneol=native#text/plain
 src/main/java/forge/StaticEffect.java svneol=native#text/plain
 src/main/java/forge/StaticEffects.java svneol=native#text/plain
@@ -11659,6 +11641,20 @@ src/main/java/forge/game/phase/PhaseType.java -text
 src/main/java/forge/game/phase/PhaseUtil.java svneol=native#text/plain
 src/main/java/forge/game/phase/Untap.java -text
 src/main/java/forge/game/phase/Upkeep.java svneol=native#text/plain
+src/main/java/forge/game/player/AIPlayer.java svneol=native#text/plain
+src/main/java/forge/game/player/Computer.java svneol=native#text/plain
+src/main/java/forge/game/player/ComputerAIGeneral.java svneol=native#text/plain
+src/main/java/forge/game/player/ComputerAIInput.java svneol=native#text/plain
+src/main/java/forge/game/player/ComputerUtil.java svneol=native#text/plain
+src/main/java/forge/game/player/ComputerUtilAttack.java svneol=native#text/plain
+src/main/java/forge/game/player/DefaultPlayerZone.java svneol=native#text/plain
+src/main/java/forge/game/player/HumanPlayer.java svneol=native#text/plain
+src/main/java/forge/game/player/IPlayerZone.java svneol=native#text/plain
+src/main/java/forge/game/player/Player.java svneol=native#text/plain
+src/main/java/forge/game/player/PlayerType.java svneol=native#text/plain
+src/main/java/forge/game/player/PlayerUtil.java svneol=native#text/plain
+src/main/java/forge/game/player/PlayerZone.java svneol=native#text/plain
+src/main/java/forge/game/player/PlayerZoneComesIntoPlay.java svneol=native#text/plain
 src/main/java/forge/gui/CardContainer.java svneol=native#text/plain
 src/main/java/forge/gui/CardListViewer.java -text
 src/main/java/forge/gui/ForgeAction.java svneol=native#text/plain

src/main/java/forge/AllZone.java

@@ -29,6 +29,8 @@ import forge.control.input.InputControl;
 import forge.game.GameState;
 import forge.game.phase.Combat;
 import forge.game.phase.EndOfTurn;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.QuestController;
@@ -80,7 +82,7 @@ public final class AllZone {
      * 
      * Will eventually be marked deprecated.
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      * @since 1.0.15
      */
     public static Player getHumanPlayer() {
@@ -98,7 +100,7 @@ public final class AllZone {
      * 
      * Will eventually be marked deprecated.
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      * @since 1.0.15
      */
     public static Player getComputerPlayer() {
@@ -331,7 +333,7 @@ public final class AllZone {
      * 
      * Will eventually be marked deprecated.
      * 
-     * @return a {@link forge.PlayerZone} object.
+     * @return a {@link forge.game.player.PlayerZone} object.
      * @since 1.0.15
      */
     public static PlayerZone getStackZone() {
@@ -345,7 +347,7 @@ public final class AllZone {
      * 
      * @param c
      *            a {@link forge.Card} object.
-     * @return a {@link forge.PlayerZone} object.
+     * @return a {@link forge.game.player.PlayerZone} object.
      */
     public static PlayerZone getZoneOf(final Card c) {
         final GameState gameState = Singletons.getModel().getGameState();

src/main/java/forge/AllZoneUtil.java

@@ -19,6 +19,7 @@ package forge;
 
 import java.util.ArrayList;
 import forge.Constant.Zone;
+import forge.game.player.Player;
 
 /**
  * AllZoneUtil contains static functions used to get CardLists of various cards
@@ -262,7 +263,7 @@ public abstract class AllZoneUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param type
      *            a {@link java.lang.String} object.
      * @return a int.
@@ -281,7 +282,7 @@ public abstract class AllZoneUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param type
      *            a {@link java.lang.String} object.
      * @return a int.
@@ -319,7 +320,7 @@ public abstract class AllZoneUtil {
      * </p>
      * 
      * @param player
-     *            the {@link forge.Player} player to determine if is affected by
+     *            the {@link forge.game.player.Player} player to determine if is affected by
      *            Doubling Season
      * @return a int.
      */
@@ -336,7 +337,7 @@ public abstract class AllZoneUtil {
      * </p>
      * 
      * @param player
-     *            the {@link forge.Player} player to determine if is affected by
+     *            the {@link forge.game.player.Player} player to determine if is affected by
      *            Doubling Season
      * @return a int.
      */

src/main/java/forge/Card.java

@@ -50,6 +50,8 @@ import forge.card.spellability.Target;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.item.CardDb;
 import forge.util.MyRandom;
 
@@ -3588,7 +3590,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * Getter for the field <code>owner</code>.
      * </p>
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public final Player getOwner() {
         return this.owner;
@@ -3597,7 +3599,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     /**
      * Get the controller for this card.
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public final Player getController() {
         if (this.controllerObjects.size() == 0) {
@@ -3701,7 +3703,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public final void setOwner(final Player player) {
         this.owner = player;
@@ -3943,7 +3945,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * getEnchantingPlayer.
      * </p>
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public final Player getEnchantingPlayer() {
         if ((this.enchanting != null) && (this.enchanting instanceof Player)) {
@@ -6276,7 +6278,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @param restriction
      *            a {@link java.lang.String} object.
      * @param sourceController
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param source
      *            a {@link forge.Card} object.
      * @return a boolean.
@@ -6324,7 +6326,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @param property
      *            a {@link java.lang.String} object.
      * @param sourceController
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param source
      *            a {@link forge.Card} object.
      * @return a boolean.

src/main/java/forge/CardList.java

@@ -25,6 +25,7 @@ import com.google.code.jyield.Generator;
 import com.google.code.jyield.Yieldable;
 
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**
@@ -449,7 +450,7 @@ public class CardList implements Iterable<Card> {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.CardList} object.
      */
     public final CardList getController(final Player player) {
@@ -467,7 +468,7 @@ public class CardList implements Iterable<Card> {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.CardList} object.
      */
     public final CardList getOwner(final Player player) {
@@ -791,7 +792,7 @@ public class CardList implements Iterable<Card> {
      * @param restrictions
      *            a {@link java.lang.String} object.
      * @param sourceController
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param source
      *            a {@link forge.Card} object.
      * @return a {@link forge.CardList} object.
@@ -808,7 +809,7 @@ public class CardList implements Iterable<Card> {
      * @param restrictions
      *            a {@link java.lang.String} object.
      * @param sourceController
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param source
      *            a {@link forge.Card} object.
      * @return a {@link forge.CardList} object.

src/main/java/forge/CardUtil.java

@@ -37,6 +37,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityList;
 import forge.card.trigger.TriggerType;
 import forge.control.input.InputPayManaCostUtil;
+import forge.game.player.DefaultPlayerZone;
 import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;

src/main/java/forge/ExternalPanel.java

@@ -1,143 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-/**
- * ExternalPanel.java
- *
- * Created on 13.08.2009
- */
-
-/**
- * The class ExternalPanel. A panel with which some other component can be shown
- * in an external window.
- * 
- * @author Clemens Koza
- * @version V0.0 13.08.2009
- */
-public class ExternalPanel extends JPanel {
-
-    /** Constant <code>serialVersionUID=9098962430872706173L</code>. */
-    private static final long serialVersionUID = 9098962430872706173L;
-    private final Component child, head;
-    private JFrame frame;
-
-    /**
-     * <p>
-     * Constructor for ExternalPanel.
-     * </p>
-     * 
-     * @param child
-     *            a {@link java.awt.Component} object.
-     */
-    public ExternalPanel(final Component child) {
-        this(child, BorderLayout.EAST);
-    }
-
-    /**
-     * <p>
-     * Constructor for ExternalPanel.
-     * </p>
-     * 
-     * @param child
-     *            a {@link java.awt.Component} object.
-     * @param side
-     *            a {@link java.lang.String} object.
-     */
-    public ExternalPanel(final Component child, final String side) {
-        super(new BorderLayout());
-        this.child = child;
-        this.add(this.child);
-        final JButton b = new JButton();
-        b.setPreferredSize(new Dimension(6, 6));
-        b.setToolTipText("Click to move component into an extra Window");
-        b.addActionListener(new ExternListener());
-        this.head = b;
-        this.setHeadSide(side);
-    }
-
-    /**
-     * <p>
-     * setHeadSide.
-     * </p>
-     * 
-     * @param side
-     *            a {@link java.lang.String} object.
-     */
-    public final void setHeadSide(final String side) {
-        this.remove(this.head);
-        this.add(this.head, side);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected final void addImpl(final Component comp, final Object constraints, final int index) {
-        if ((comp != this.child) && (comp != this.head)) {
-            throw new IllegalArgumentException();
-        }
-        super.addImpl(comp, constraints, index);
-    }
-
-    private final class ExternListener extends WindowAdapter implements ActionListener {
-        private void bringOut() {
-            ExternalPanel.this.frame = new JFrame();
-            ExternalPanel.this.frame.addWindowListener(this);
-            ExternalPanel.this.frame.addWindowStateListener(this);
-            ExternalPanel.this.frame.add(ExternalPanel.this.child);
-            ExternalPanel.this.frame.getRootPane().setPreferredSize(ExternalPanel.this.child.getSize());
-            ExternalPanel.this.frame.pack();
-            ExternalPanel.this.frame.setVisible(true);
-            ExternalPanel.this.validate();
-            ExternalPanel.this.repaint();
-        }
-
-        private void bringIn() {
-            ExternalPanel.this.add(ExternalPanel.this.child);
-            ExternalPanel.this.frame.dispose();
-            ExternalPanel.this.frame = null;
-            ExternalPanel.this.validate();
-            ExternalPanel.this.repaint();
-        }
-
-        @Override
-        public void actionPerformed(final ActionEvent e) {
-            if (ExternalPanel.this.frame == null) {
-                this.bringOut();
-            } else {
-                this.bringIn();
-            }
-        }
-
-        @Override
-        public void windowClosing(final WindowEvent e) {
-            this.bringIn();
-        }
-    }
-}

src/main/java/forge/GameAction.java

@@ -50,6 +50,10 @@ import forge.control.input.InputPayManaCostUtil;
 import forge.game.GameEndReason;
 import forge.game.GameSummary;
 import forge.game.phase.PhaseHandler;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
+import forge.game.player.PlayerZoneComesIntoPlay;
 import forge.gui.GuiUtils;
 import forge.view.match.ViewWinLose;
 
@@ -82,9 +86,9 @@ public class GameAction {
      * </p>
      * 
      * @param zoneFrom
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      * @param zoneTo
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      * @param c
      *            a {@link forge.Card} object.
      * @return a {@link forge.Card} object.
@@ -228,7 +232,7 @@ public class GameAction {
      * </p>
      * 
      * @param zone
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      * @param c
      *            a {@link forge.Card} object.
      * @return a {@link forge.Card} object.
@@ -526,7 +530,7 @@ public class GameAction {
      * @param c
      *            a {@link forge.Card} object.
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.Card} object.
      */
     public final Card moveToPlay(final Card c, final Player p) {

src/main/java/forge/GameActionUtil.java

@@ -32,6 +32,9 @@ import forge.card.spellability.SpellAbility;
 import forge.control.input.InputPayManaCostAbility;
 import forge.control.input.InputPayManaCostUtil;
 import forge.game.GameLossReason;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 
@@ -452,7 +455,7 @@ public final class GameActionUtil {
      * </p>
      * 
      * @param caller
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param source
      *            a {@link forge.Card} object.
      * @return a boolean.
@@ -708,7 +711,7 @@ public final class GameActionUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param c
      *            a {@link forge.Card} object.
      * @param damage
@@ -769,7 +772,7 @@ public final class GameActionUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param c
      *            a {@link forge.Card} object.
      * @param damage
@@ -1722,7 +1725,7 @@ public final class GameActionUtil {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public static void doPowerSink(final Player p) {
         // get all lands with mana abilities

src/main/java/forge/GameEntity.java

@@ -20,6 +20,7 @@ package forge;
 import java.util.ArrayList;
 
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * <p>

src/main/java/forge/GuiDisplayUtil.java

@@ -42,6 +42,7 @@ import forge.Constant.Zone;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.AbilityMana;
 import forge.card.trigger.TriggerType;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.gui.ListChooser;
 import forge.gui.game.CardPanel;
@@ -1425,7 +1426,7 @@ public final class GuiDisplayUtil {
      * @param data
      *            an array of {@link java.lang.String} objects.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.CardList} object.
      */
     public static CardList devProcessCardsForZone(final String[] data, final Player player) {

src/main/java/forge/GuiInput.java

@@ -21,6 +21,8 @@ import java.util.Observable;
 import java.util.Observer;
 
 import forge.control.input.Input;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>
@@ -101,7 +103,7 @@ public class GuiInput extends MyObservable implements Observer {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public final void selectPlayer(final Player player) {
         this.getInput().selectPlayer(player);
@@ -115,7 +117,7 @@ public class GuiInput extends MyObservable implements Observer {
      * @param card
      *            a {@link forge.Card} object.
      * @param zone
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      */
     public final void selectCard(final Card card, final PlayerZone zone) {
         this.getInput().selectCard(card, zone);

src/main/java/forge/ImagePreviewPanel.java

@@ -1,144 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
-import javax.swing.ImageIcon;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-
-/**
- * <p>
- * ImagePreviewPanel class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-public class ImagePreviewPanel extends JPanel implements PropertyChangeListener {
-
-    /** Constant <code>serialVersionUID=2163809931940286240L</code>. */
-    private static final long serialVersionUID = 2163809931940286240L;
-    private int width, height;
-    private ImageIcon icon;
-    private Image image;
-    /** Constant <code>ACCSIZE=155</code>. */
-    private static final int ACCSIZE = 155;
-    private final Color bg;
-
-    /**
-     * <p>
-     * Constructor for ImagePreviewPanel.
-     * </p>
-     */
-    public ImagePreviewPanel() {
-        this.setPreferredSize(new Dimension(ImagePreviewPanel.ACCSIZE, -1));
-        this.bg = this.getBackground();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final void propertyChange(final PropertyChangeEvent e) {
-        final String propertyName = e.getPropertyName();
-
-        // Make sure we are responding to the right event.
-        if (propertyName.equals(JFileChooser.SELECTED_FILE_CHANGED_PROPERTY)) {
-            final File selection = (File) e.getNewValue();
-            String name;
-
-            if (selection == null) {
-                return;
-            } else {
-                name = selection.getAbsolutePath();
-            }
-
-            /*
-             * Make reasonably sure we have an image format that AWT can handle
-             * so we don't try to draw something silly.
-             */
-            if ((name != null)
-                    && (name.toLowerCase().endsWith(".jpg") || name.toLowerCase().endsWith(".jpeg")
-                            || name.toLowerCase().endsWith(".gif") || name.toLowerCase().endsWith(".png"))) {
-                this.icon = new ImageIcon(name);
-                this.image = this.icon.getImage();
-                this.scaleImage();
-                this.repaint();
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * scaleImage.
-     * </p>
-     */
-    private void scaleImage() {
-        this.width = this.image.getWidth(this);
-        this.height = this.image.getHeight(this);
-        double ratio = 1.0;
-
-        /*
-         * Determine how to scale the image. Since the accessory can expand
-         * vertically make sure we don't go larger than 150 when scaling
-         * vertically.
-         */
-        if (this.width >= this.height) {
-            ratio = (double) (ImagePreviewPanel.ACCSIZE - 5) / this.width;
-            this.width = ImagePreviewPanel.ACCSIZE - 5;
-            this.height = (int) (this.height * ratio);
-        } else {
-            if (this.getHeight() > 150) {
-                ratio = (double) (ImagePreviewPanel.ACCSIZE - 5) / this.height;
-                this.height = ImagePreviewPanel.ACCSIZE - 5;
-                this.width = (int) (this.width * ratio);
-            } else {
-                ratio = (double) this.getHeight() / this.height;
-                this.height = this.getHeight();
-                this.width = (int) (this.width * ratio);
-            }
-        }
-
-        this.image = this.image.getScaledInstance(this.width, this.height, Image.SCALE_DEFAULT);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final void paintComponent(final Graphics g) {
-        g.setColor(this.bg);
-
-        /*
-         * If we don't do this, we will end up with garbage from previous images
-         * if they have larger sizes than the one we are currently drawing.
-         * Also, it seems that the file list can paint outside of its rectangle,
-         * and will cause odd behavior if we don't clear or fill the rectangle
-         * for the accessory before drawing. This might be a bug in
-         * JFileChooser.
-         */
-        g.fillRect(0, 0, ImagePreviewPanel.ACCSIZE, this.getHeight());
-        g.drawImage(this.image, ((this.getWidth() / 2) - (this.width / 2)) + 5, (this.getHeight() / 2)
-                - (this.height / 2), this);
-    }
-
-}

src/main/java/forge/MagicStack.java

@@ -45,6 +45,9 @@ import forge.card.trigger.TriggerType;
 import forge.control.input.Input;
 import forge.control.input.InputPayManaCostAbility;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**
@@ -1351,7 +1354,7 @@ public class MagicStack extends MyObservable {
      * </p>
      * 
      * @param activePlayer
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public final void chooseOrderOfSimultaneousStackEntry(final Player activePlayer) {
         if (this.getSimultaneousStackEntryList().size() == 0) {

src/main/java/forge/Move.java

@@ -1,107 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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;
-
-/**
- * <p>
- * Abstract Move class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-public abstract class Move {
-    /**
-     * <p>
-     * generateMoves.
-     * </p>
-     * 
-     * @return an array of {@link forge.Move} objects.
-     */
-    public abstract Move[] generateMoves();
-
-    /**
-     * <p>
-     * getScore.
-     * </p>
-     * 
-     * @return a int.
-     */
-    public abstract int getScore();
-
-    /** The best move. */
-    // private Move bestMove = null;
-
-    /** The best score. */
-    private int bestScore = Integer.MIN_VALUE;
-
-    /**
-     * <p>
-     * min.
-     * </p>
-     * 
-     * @param move
-     *            a {@link forge.Move} object.
-     * @param depth
-     *            a int.
-     * @return a int.
-     */
-    public final int min(final Move move, final int depth) {
-        if (depth == 0) {
-            return move.getScore();
-        }
-
-        final Move[] v = move.generateMoves();
-        int score = Integer.MAX_VALUE;
-        for (final Move element : v) {
-            score = Math.min(score, this.max(element, depth - 1, false));
-        }
-        return score;
-    }
-
-    /**
-     * <p>
-     * max.
-     * </p>
-     * 
-     * @param move
-     *            a {@link forge.Move} object.
-     * @param depth
-     *            a int.
-     * @param first
-     *            a boolean.
-     * @return a int.
-     */
-    public final int max(final Move move, final int depth, final boolean first) {
-        if (depth == 0) {
-            return move.getScore();
-        }
-
-        final Move[] v = move.generateMoves();
-        int score = Integer.MIN_VALUE;
-        for (final Move element : v) {
-            score = Math.max(score, this.min(element, depth - 1));
-
-            if (first && (this.bestScore < score)) {
-                this.bestScore = score;
-                // bestMove = v[i];
-            }
-        } // for
-        return score;
-    } // max()
-}

src/main/java/forge/SimpleCombat.java

@@ -1,193 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * <p>
- * SimpleCombat class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-class SimpleCombat {
-    private final HashMap<Card, CardList> map = new HashMap<Card, CardList>();
-    private final CardList attackers = new CardList();
-
-    /**
-     * <p>
-     * Constructor for SimpleCombat.
-     * </p>
-     */
-    public SimpleCombat() {
-    }
-
-    /**
-     * <p>
-     * Constructor for SimpleCombat.
-     * </p>
-     * 
-     * @param attackingCreatures
-     *            a {@link forge.CardList} object.
-     */
-    public SimpleCombat(final CardList attackingCreatures) {
-        final CardList a = attackingCreatures;
-        for (int i = 0; i < a.size(); i++) {
-            this.addAttacker(a.get(i));
-        }
-    }
-
-    /**
-     * <p>
-     * Getter for the field <code>attackers</code>.
-     * </p>
-     * 
-     * @return a {@link forge.CardList} object.
-     */
-    public CardList getAttackers() {
-        return this.attackers;
-    }
-
-    /**
-     * <p>
-     * addAttacker.
-     * </p>
-     * 
-     * @param c
-     *            a {@link forge.Card} object.
-     */
-    public void addAttacker(final Card c) {
-        this.attackers.add(c);
-        this.map.put(c, new CardList());
-    }
-
-    /**
-     * <p>
-     * getBlockers.
-     * </p>
-     * 
-     * @param attacker
-     *            a {@link forge.Card} object.
-     * @return a {@link forge.CardList} object.
-     */
-    public CardList getBlockers(final Card attacker) {
-        return this.map.get(attacker);
-    }
-
-    /**
-     * <p>
-     * addBlocker.
-     * </p>
-     * 
-     * @param attacker
-     *            a {@link forge.Card} object.
-     * @param blocker
-     *            a {@link forge.Card} object.
-     */
-    public void addBlocker(final Card attacker, final Card blocker) {
-        final CardList list = this.map.get(attacker);
-        if (list == null) {
-            throw new RuntimeException("SimpleCombat : addBlocker() attacker not found - " + attacker);
-        }
-
-        list.add(blocker);
-    }
-
-    /**
-     * <p>
-     * getUnblockedAttackers.
-     * </p>
-     * 
-     * @return a {@link forge.CardList} object.
-     */
-    public CardList getUnblockedAttackers() {
-        final CardList list = new CardList();
-        final Iterator<Card> it = this.map.keySet().iterator();
-        while (it.hasNext()) {
-            final Card attack = it.next();
-            final CardList block = this.map.get(attack);
-            if (block.size() == 0) {
-                list.add(attack);
-            }
-        }
-
-        return list;
-    }
-
-    // creatures destroy each other in combat damage
-    /**
-     * <p>
-     * combatDamage.
-     * </p>
-     * 
-     * @return an array of {@link forge.CardList} objects.
-     */
-    public CardList[] combatDamage() {
-        // aDestroy holds the number of creatures of A's that were destroyed
-        final CardList aDestroy = new CardList();
-        final CardList bDestroy = new CardList();
-
-        final CardList allAttackers = this.getAttackers();
-        for (int i = 0; i < allAttackers.size(); i++) {
-            final Card attack = allAttackers.get(i);
-            // for now, CardList blockers should only hold 1 Card
-            final CardList blockers = this.map.get(attack);
-            if (blockers.size() == 0) {
-            } else {
-
-                final Card block = blockers.get(0);
-                final int blockerDamage = block.getNetCombatDamage();
-                final int attackerDamage = attack.getNetCombatDamage();
-
-                if (attack.getNetDefense() <= blockerDamage) {
-                    aDestroy.add(attack);
-                }
-
-                if (block.getNetDefense() <= attackerDamage) {
-                    bDestroy.add(block);
-                }
-            }
-        } // while
-        return new CardList[] { aDestroy, bDestroy };
-    } // combatDamage()
-
-    /** {@inheritDoc} */
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        final CardList attack = this.getAttackers();
-        CardList block;
-        for (int i = 0; i < attack.size(); i++) {
-            block = this.getBlockers(attack.get(i));
-            if (block.isEmpty()) {
-                sb.append(attack.get(i));
-                sb.append(" ");
-            } else {
-                sb.append(attack.get(i));
-                sb.append(" - ");
-                sb.append(block.get(0));
-                sb.append(" ");
-            }
-        }
-
-        return sb.toString();
-    }
-} // end class SimpleCombat

src/main/java/forge/StaticEffect.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * <p>

src/main/java/forge/StaticEffects.java

@@ -28,6 +28,7 @@ import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.staticability.StaticAbility;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -26,11 +26,9 @@ import forge.Card;
 import forge.CardList;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -43,6 +41,8 @@ import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -25,9 +25,7 @@ import java.util.Random;
 import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
-import forge.ComputerUtil;
 import forge.Counters;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.cost.CostUtil;
@@ -37,6 +35,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**

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

@@ -29,9 +29,7 @@ import forge.Card;
 import forge.CardList;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.AbilityActivated;
@@ -43,6 +41,8 @@ import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -30,11 +30,9 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
 import forge.GameEntity;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -47,6 +45,8 @@ import forge.card.spellability.Target;
 import forge.card.staticability.StaticAbility;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -30,13 +30,10 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardListUtil;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
 import forge.GameEntity;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -50,6 +47,9 @@ import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 
@@ -800,7 +800,7 @@ public final class AbilityFactoryChangeZone {
      * @param sa
      *            a {@link forge.card.spellability.SpellAbility} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     private static void changeHiddenOriginResolveHuman(final AbilityFactory af, final SpellAbility sa, Player player) {
         final HashMap<String, String> params = af.getMapParams();
@@ -1000,7 +1000,7 @@ public final class AbilityFactoryChangeZone {
      * @param sa
      *            a {@link forge.card.spellability.SpellAbility} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     private static void changeHiddenOriginResolveAI(final AbilityFactory af, final SpellAbility sa, Player player) {
         final HashMap<String, String> params = af.getMapParams();

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

@@ -35,16 +35,16 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.gui.ListChooser;
 import forge.item.CardDb;

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

@@ -28,7 +28,6 @@ import forge.Card;
 import forge.CardList;
 import forge.Constant;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilitySub;
@@ -36,6 +35,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.trigger.TriggerType;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -24,9 +24,7 @@ import forge.AllZone;
 import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.AbilityActivated;
@@ -36,6 +34,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -30,9 +30,7 @@ import forge.CardCharactersticName;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.Ability;
@@ -43,6 +41,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.trigger.TriggerType;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -22,7 +22,6 @@ import java.util.HashMap;
 
 import forge.AllZone;
 import forge.Card;
-import forge.ComputerUtil;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -34,6 +33,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.card.spellability.Target;
 import forge.card.spellability.TargetSelection;
+import forge.game.player.ComputerUtil;
 import forge.util.MyRandom;
 
 //Destination - send countered spell to: (only applies to Spells; ignored for Abilities)

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

@@ -29,12 +29,9 @@ import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -47,6 +44,9 @@ import forge.card.spellability.Target;
 import forge.control.input.Input;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -27,9 +27,7 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -41,6 +39,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.spellability.TargetSelection;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**
@@ -463,7 +463,7 @@ public class AbilityFactoryDealDamage {
      * @param noPrevention
      *            a boolean.
      * @param pl
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param mandatory
      *            a boolean.
      * @return a {@link forge.Card} object.
@@ -1124,7 +1124,7 @@ public class AbilityFactoryDealDamage {
      * @param sa
      *            a {@link forge.card.spellability.SpellAbility} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param dmg
      *            a int.
      * @return a {@link forge.CardList} object.

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

@@ -29,7 +29,6 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -43,6 +42,7 @@ import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
 import forge.util.MyRandom;
 
 /**

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

@@ -28,10 +28,8 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -41,6 +39,8 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**

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

@@ -26,9 +26,7 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.replacement.ReplacementEffect;
 import forge.card.replacement.ReplacementHandler;
@@ -43,6 +41,8 @@ import forge.card.trigger.TriggerType;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**

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

@@ -21,14 +21,14 @@ import java.util.ArrayList;
 
 import forge.AllZone;
 import forge.Card;
-import forge.ComputerUtil;
-import forge.Player;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.GameLossReason;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -28,11 +28,9 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameEntity;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.Ability;
@@ -42,6 +40,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 //AB:GainControl|ValidTgts$Creature|TgtPrompt$Select target legendary creature|LoseControl$Untap,LoseControl|SpellDescription$Gain control of target xxxxxxx
 
@@ -584,7 +584,7 @@ public class AbilityFactoryGainControl {
      * @param i
      *            a int.
      * @param originalController
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.Command} object.
      */
     private Command getLoseControlCommand(final Card c, final Player originalController) {

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

@@ -26,11 +26,9 @@ import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -41,6 +39,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.control.input.InputPayManaCostUtil;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 
@@ -788,7 +788,7 @@ public class AbilityFactoryMana {
      * @param colors
      *            a {@link java.util.ArrayList} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link java.lang.String} object.
      */
     private static String generatedReflectedMana(final AbilityMana abMana, final AbilityFactory af,
@@ -871,7 +871,7 @@ public class AbilityFactoryMana {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a boolean.
      */
     private static boolean hasUrzaLands(final Player p) {

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

@@ -27,9 +27,7 @@ import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -41,6 +39,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -27,10 +27,8 @@ import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -43,6 +41,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.Target;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 /**

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

@@ -26,9 +26,7 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListUtil;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -40,6 +38,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -31,10 +31,8 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -46,6 +44,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -28,10 +28,8 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.GameEntity;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -45,6 +43,8 @@ import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**

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

@@ -27,7 +27,6 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -40,6 +39,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
 
 /**
  * <p>

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

@@ -31,12 +31,9 @@ import forge.Card;
 import forge.CardCharactersticName;
 import forge.CardList;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.cost.CostUtil;
@@ -46,6 +43,9 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -25,10 +25,8 @@ import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -38,6 +36,8 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 
@@ -487,7 +487,7 @@ public class AbilityFactorySacrifice {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param amount
      *            a int.
      * @param valid
@@ -510,7 +510,7 @@ public class AbilityFactorySacrifice {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param amount
      *            a int.
      * @param valid

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

@@ -27,12 +27,12 @@ import forge.Card;
 import forge.CardCharactersticName;
 import forge.CardList;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.game.player.Player;
 
 /**
  * AbilityFactory for abilities that cause cards to change states.

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

@@ -25,9 +25,7 @@ import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -40,6 +38,8 @@ import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.util.MyRandom;
 
 /**

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

@@ -22,8 +22,6 @@ import java.util.HashMap;
 
 import forge.AllZone;
 import forge.Card;
-import forge.ComputerUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilitySub;
@@ -31,6 +29,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -27,11 +27,9 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListUtil;
 import forge.CardUtil;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -42,6 +40,8 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -37,13 +37,10 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.spellability.Ability;
@@ -57,6 +54,9 @@ import forge.card.trigger.TriggerType;
 import forge.control.input.Input;
 import forge.control.input.InputPayManaCost;
 import forge.game.GameLossReason;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
@@ -404,7 +404,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface {
      * @param cardName
      *            a {@link java.lang.String} object.
      * @param owner
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.Card} instance, owned by owner; or the special
      *         blankCard
      */

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

@@ -32,7 +32,6 @@ import forge.CardUtil;
 import forge.Command;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.spellability.Ability;
@@ -41,6 +40,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.control.input.Input;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -38,8 +38,6 @@ import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cost.Cost;
@@ -54,6 +52,8 @@ import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerType;
 import forge.control.input.Input;
 import forge.control.input.InputPayManaCost;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -23,11 +23,8 @@ import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.spellability.Ability;
@@ -36,6 +33,9 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.phase.PhaseUtil;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -21,8 +21,8 @@ import java.util.Iterator;
 
 import forge.Card;
 import forge.CardList;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Interface CardFactoryInterface.
@@ -108,7 +108,7 @@ public interface CardFactoryInterface extends Iterable<Card> {
      * @param cardName
      *            a {@link java.lang.String} object.
      * @param owner
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.Card} instance, owned by owner; or the special
      *         blankCard
      */

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

@@ -30,8 +30,6 @@ import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.spellability.Ability;
@@ -40,6 +38,8 @@ import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
 import forge.game.phase.PhaseType;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 

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

@@ -35,13 +35,9 @@ import forge.CardListFilter;
 import forge.CardListUtil;
 import forge.CardUtil;
 import forge.Command;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.HandSizeOp;
-import forge.Player;
-import forge.PlayerUtil;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.cost.Cost;
 import forge.card.spellability.AbilitySub;
@@ -51,6 +47,10 @@ import forge.card.spellability.Target;
 import forge.control.input.Input;
 import forge.control.input.InputPayManaCost;
 import forge.control.input.InputPayManaCostAbility;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerUtil;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -38,14 +38,11 @@ import forge.CardListFilter;
 import forge.CardUtil;
 import forge.Command;
 import forge.CommandArgs;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
 import forge.HandSizeOp;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cost.Cost;
@@ -68,6 +65,9 @@ import forge.control.input.InputPayManaCostUtil;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 import forge.util.MyRandom;
 
@@ -2142,7 +2142,7 @@ public class CardFactoryUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a boolean.
      */
     public static boolean oppHasKismet(final Player player) {
@@ -2166,7 +2166,7 @@ public class CardFactoryUtil {
      * @param colorAbb
      *            a {@link java.lang.String} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a int.
      */
     public static int getNumberOfManaSymbolsControlledByColor(final String colorAbb, final Player player) {
@@ -2401,7 +2401,7 @@ public class CardFactoryUtil {
      * </p>
      * 
      * @param activator
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.CardList} object.
      */
     public static CardList getExternalZoneActivationCards(final Player activator) {
@@ -2425,7 +2425,7 @@ public class CardFactoryUtil {
      * @param zone
      *            a PlayerZone object.
      * @param activator
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a boolean.
      */
     public static CardList getActivateablesFromZone(final PlayerZone zone, final Player activator) {
@@ -3760,7 +3760,7 @@ public class CardFactoryUtil {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a int.
      */
     public static int getUsableManaSources(final Player player) {
@@ -3786,7 +3786,7 @@ public class CardFactoryUtil {
      * </p>
      * 
      * @param controller
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a {@link forge.CardList} object.
      */
     public static CardList makeTokenSaproling(final Player controller) {
@@ -3804,7 +3804,7 @@ public class CardFactoryUtil {
      * @param imageName
      *            a {@link java.lang.String} object.
      * @param controller
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @param manaCost
      *            a {@link java.lang.String} object.
      * @param types

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

@@ -22,15 +22,15 @@ import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
 import forge.CardListUtil;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostDiscard.

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

@@ -25,16 +25,16 @@ import forge.AllZone;
 import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -20,9 +20,9 @@ package forge.card.cost;
 import forge.AllZone;
 import forge.Card;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostGainLife.

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

@@ -22,10 +22,7 @@ import com.google.common.base.Strings;
 import forge.AllZone;
 import forge.ButtonUtil;
 import forge.Card;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.mana.ManaCost;
@@ -35,6 +32,9 @@ import forge.control.input.Input;
 import forge.control.input.InputMana;
 import forge.control.input.InputPayManaCostUtil;
 import forge.game.phase.PhaseHandler;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostMana.

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

@@ -25,11 +25,11 @@ import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * This is for the "Mill" Cost. Putting cards from the top of your library into

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

@@ -18,8 +18,8 @@
 package forge.card.cost;
 
 import forge.Card;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostPart.

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

@@ -20,9 +20,9 @@ package forge.card.cost;
 import forge.AllZone;
 import forge.Card;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostPayLife.

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

@@ -23,9 +23,9 @@ import java.util.Map;
 
 import forge.AllZone;
 import forge.Card;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRequirements;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -22,13 +22,13 @@ import forge.Card;
 import forge.CardList;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostPutCounter.

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

@@ -19,9 +19,9 @@ package forge.card.cost;
 
 import forge.Card;
 import forge.Counters;
-import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostRemoveCounter.

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

@@ -23,14 +23,14 @@ import forge.AllZoneUtil;
 import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostReturn.

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

@@ -21,15 +21,15 @@ import forge.AllZone;
 import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -23,14 +23,14 @@ import forge.AllZoneUtil;
 import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostSacrifice.

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

@@ -18,8 +18,8 @@
 package forge.card.cost;
 
 import forge.Card;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostTap.

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

@@ -21,15 +21,15 @@ import forge.ButtonUtil;
 import forge.Card;
 import forge.CardList;
 import forge.CardListFilter;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * The Class CostTapType.

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

@@ -18,8 +18,8 @@
 package forge.card.cost;
 
 import forge.Card;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class CostUntap.

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

@@ -22,12 +22,12 @@ import java.util.Random;
 import forge.AllZone;
 import forge.Card;
 import forge.CardList;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -25,11 +25,11 @@ import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardUtil;
 import forge.Constant;
-import forge.Player;
 import forge.Singletons;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
 import forge.control.input.InputPayManaCostUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 
 /**
@@ -62,7 +62,7 @@ public class ManaPool {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public ManaPool(final Player player) {
         owner = player;

src/main/java/forge/card/replacement/ReplacementHandler.java

@@ -23,13 +23,13 @@ import java.util.List;
 
 import forge.AllZone;
 import forge.Card;
-import forge.ComputerUtil;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 import forge.gui.GuiUtils;
 
 /**

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

@@ -22,11 +22,11 @@ import java.util.HashMap;
 import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
-import forge.Player;
 import forge.card.cost.Cost;
 import forge.card.mana.ManaPool;
 import forge.card.trigger.TriggerType;
 import forge.control.input.InputPayManaCostUtil;
+import forge.game.player.Player;
 
 /**
  * <p>
@@ -154,7 +154,7 @@ public abstract class AbilityMana extends AbilityActivated implements java.io.Se
      * @param produced
      *            a {@link java.lang.String} object.
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public final void produceMana(final String produced, final Player player) {
         final Card source = this.getSourceCard();

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

@@ -25,13 +25,13 @@ import forge.Card;
 import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
 import forge.card.cost.CostPayment;
 import forge.card.staticability.StaticAbility;
 import forge.error.ErrorViewer;
 import forge.game.phase.PhaseHandler;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -24,13 +24,13 @@ import forge.Card;
 import forge.CardList;
 import forge.Command;
 import forge.CommandArgs;
-import forge.ComputerUtil;
 import forge.GameEntity;
-import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cost.Cost;
 import forge.card.mana.Mana;
 import forge.control.input.Input;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 //only SpellAbility can go on the stack
 //override any methods as needed
@@ -368,7 +368,7 @@ public abstract class SpellAbility {
      * Getter for the field <code>activatingPlayer</code>.
      * </p>
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public Player getActivatingPlayer() {
         return this.activatingPlayer;
@@ -380,7 +380,7 @@ public abstract class SpellAbility {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public void setActivatingPlayer(final Player player) {
         // trickle down activating player
@@ -1353,7 +1353,7 @@ public abstract class SpellAbility {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public void setTargetPlayer(final Player p) {
         if ((p == null) || (!(p.isHuman() || p.isComputer()))) {
@@ -1376,7 +1376,7 @@ public abstract class SpellAbility {
      * Getter for the field <code>targetPlayer</code>.
      * </p>
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public Player getTargetPlayer() {
         if (this.targetPlayer == null) {

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

@@ -22,12 +22,12 @@ import java.util.HashMap;
 import forge.AllZoneUtil;
 import forge.CardList;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -19,7 +19,7 @@ package forge.card.spellability;
 
 import java.util.ArrayList;
 
-import forge.ComputerUtil;
+import forge.game.player.ComputerUtil;
 
 /**
  * <p>

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

@@ -21,10 +21,10 @@ import java.util.ArrayList;
 
 import forge.AllZone;
 import forge.Card;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cost.CostPayment;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>

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

@@ -24,13 +24,13 @@ import forge.AllZoneUtil;
 import forge.Card;
 import forge.CardList;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>

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

@@ -21,7 +21,7 @@ import java.util.HashMap;
 
 import forge.Card;
 import forge.CardList;
-import forge.Player;
+import forge.game.player.Player;
 
 /**
  * <p>
@@ -193,7 +193,7 @@ public class SpellAbilityStackInstance {
      * Getter for the field <code>activatingPlayer</code>.
      * </p>
      * 
-     * @return a {@link forge.Player} object.
+     * @return a {@link forge.game.player.Player} object.
      */
     public final Player getActivatingPlayer() {
         return this.activatingPlayer;

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

@@ -27,11 +27,8 @@ import forge.CardList;
 import forge.CardUtil;
 import forge.Command;
 import forge.CommandReturn;
-import forge.ComputerAIGeneral;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -40,6 +37,9 @@ import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerType;
 import forge.control.input.Input;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerAIGeneral;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -25,8 +25,8 @@ import forge.AllZone;
 import forge.AllZoneUtil;
 import forge.Card;
 import forge.Constant;
-import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -20,7 +20,7 @@ package forge.card.spellability;
 import java.util.ArrayList;
 
 import forge.Card;
-import forge.Player;
+import forge.game.player.Player;
 
 /**
  * <p>
@@ -94,7 +94,7 @@ public class TargetChoices {
      * </p>
      * 
      * @param p
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      * @return a boolean.
      */
     public final boolean addTarget(final Player p) {

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

@@ -28,11 +28,11 @@ import forge.Card;
 import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.control.input.Input;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 import forge.gui.GuiUtils;
 
 /**

src/main/java/forge/card/staticability/StaticAbility.java

@@ -26,11 +26,11 @@ import forge.AllZoneUtil;
 import forge.Card;
 import forge.Constant.Zone;
 import forge.GameEntity;
-import forge.Player;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.spellability.SpellAbility;
 import forge.game.phase.PhaseType;
+import forge.game.player.Player;
 
 /**
  * The Class StaticAbility.

src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java

@@ -22,11 +22,11 @@ import java.util.List;
 
 import forge.AllZone;
 import forge.Card;
-import forge.Player;
 import forge.Constant.Zone;
 import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
 import forge.game.phase.PhaseHandler;
+import forge.game.player.Player;
 
 /**
  * The Class StaticAbility_CantBeCast.

src/main/java/forge/card/staticability/StaticAbilityCantTarget.java

@@ -22,8 +22,8 @@ import java.util.HashMap;
 import forge.Card;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.card.spellability.SpellAbility;
+import forge.game.player.Player;
 
 /**
  * The Class StaticAbilityCantTarget.

src/main/java/forge/card/staticability/StaticAbilityContinuous.java

@@ -27,7 +27,6 @@ import forge.Card;
 import forge.CardList;
 import forge.CardUtil;
 import forge.Constant.Zone;
-import forge.Player;
 import forge.StaticEffect;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -35,6 +34,7 @@ import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
+import forge.game.player.Player;
 
 /**
  * The Class StaticAbility_Continuous.

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

@@ -27,13 +27,13 @@ import forge.Card;
 import forge.CardList;
 import forge.CardUtil;
 import forge.Constant.Zone;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.card.TriggerReplacementBase;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.game.phase.PhaseType;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>

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

@@ -27,11 +27,9 @@ import forge.Card;
 import forge.CardList;
 import forge.Command;
 import forge.CommandArgs;
-import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.Player;
 import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.abilityfactory.AbilityFactoryCharm;
@@ -45,6 +43,8 @@ import forge.card.spellability.Target;
 import forge.control.input.Input;
 import forge.game.phase.PhaseType;
 //import forge.util.TextUtil;
+import forge.game.player.ComputerUtil;
+import forge.game.player.Player;
 
 /**
  * <p>

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

@@ -22,10 +22,10 @@ import java.util.HashMap;
 import forge.AllZone;
 
 import forge.Card;
-import forge.Player;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
+import forge.game.player.Player;
 
 /**
  * <p>

src/main/java/forge/control/ControlMatchUI.java

@@ -30,7 +30,6 @@ import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GuiMultipleBlockers;
-import forge.Player;
 import forge.Singletons;
 import forge.control.match.ControlDetail;
 import forge.control.match.ControlDock;
@@ -41,6 +40,7 @@ import forge.control.match.ControlPicture;
 import forge.control.match.ControlTabber;
 import forge.game.GameType;
 import forge.game.phase.PhaseType;
+import forge.game.player.Player;
 import forge.gui.CardContainer;
 import forge.gui.toolbox.FLabel;
 import forge.gui.toolbox.FSkin;
@@ -250,7 +250,7 @@ public class ControlMatchUI implements CardContainer {
      * 
      * Checks if game control should stop at a phase, for either
      * a forced programmatic stop, or a user-induced phase toggle.
-     * @param turn   {@link forge.Player}
+     * @param turn   {@link forge.game.player.Player}
      * @param phase   {@link java.lang.String}
      * @return boolean
      */

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

@@ -19,9 +19,9 @@ package forge.control.input;
 
 import forge.AllZone;
 import forge.Card;
-import forge.Player;
-import forge.PlayerZone;
 import forge.Singletons;
+import forge.game.player.Player;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>
@@ -55,7 +55,7 @@ public abstract class Input implements java.io.Serializable {
      * @param c
      *            a {@link forge.Card} object.
      * @param zone
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      */
     public void selectCard(final Card c, final PlayerZone zone) {
     }
@@ -66,7 +66,7 @@ public abstract class Input implements java.io.Serializable {
      * </p>
      * 
      * @param player
-     *            a {@link forge.Player} object.
+     *            a {@link forge.game.player.Player} object.
      */
     public void selectPlayer(final Player player) {
     }

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

@@ -24,7 +24,7 @@ import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.game.phase.CombatUtil;
-import forge.PlayerZone;
+import forge.game.player.PlayerZone;
 import forge.Singletons;
 
 /**
@@ -120,7 +120,7 @@ public class InputAttack extends Input {
      * @param card
      *            a {@link forge.Card} object.
      * @param zone
-     *            a {@link forge.PlayerZone} object.
+     *            a {@link forge.game.player.PlayerZone} object.
      */
     public void unselectCard(final Card card, final PlayerZone zone) {
 

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

@@ -23,9 +23,9 @@ import forge.AllZone;
 import forge.ButtonUtil;
 import forge.Card;
 import forge.Constant;
-import forge.PlayerZone;
 import forge.Singletons;
 import forge.game.phase.CombatUtil;
+import forge.game.player.PlayerZone;
 
 /**
  * <p>

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

@@ -23,7 +23,7 @@ import forge.Card;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.game.phase.CombatUtil;
-import forge.PlayerZone;
+import forge.game.player.PlayerZone;
 import forge.Singletons;
 
 /**

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

@@ -20,12 +20,12 @@ package forge.control.input;
 import java.util.LinkedList;
 import java.util.Stack;
 
-import forge.ComputerAIInput;
 import forge.MyObservable;
-import forge.Player;
 import forge.Singletons;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
+import forge.game.player.ComputerAIInput;
+import forge.game.player.Player;
 import forge.model.FModel;
 
 /**