diff --git a/.gitattributes b/.gitattributes index f7a7dea34a0..5dcf710a8a9 100644 --- a/.gitattributes +++ b/.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 diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index 64740115314..fea739155d3 100644 --- a/src/main/java/forge/AllZone.java +++ b/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(); diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java index 5e86dfec3be..3a52970de27 100644 --- a/src/main/java/forge/AllZoneUtil.java +++ b/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 { *

* * @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 { *

* * @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 { *

* * @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 { *

* * @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. */ diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 262feb726f0..ff21b784a48 100644 --- a/src/main/java/forge/Card.java +++ b/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 { * Getter for the field owner. *

* - * @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 { /** * 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 { *

* * @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 { * getEnchantingPlayer. *

* - * @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 { * @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 { * @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. diff --git a/src/main/java/forge/CardList.java b/src/main/java/forge/CardList.java index 4264754ce4d..cbea56f44e2 100644 --- a/src/main/java/forge/CardList.java +++ b/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 { *

* * @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 { *

* * @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 { * @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 { * @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. diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 9a0f2af448e..eabaeb3c72f 100644 --- a/src/main/java/forge/CardUtil.java +++ b/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; diff --git a/src/main/java/forge/ExternalPanel.java b/src/main/java/forge/ExternalPanel.java deleted file mode 100644 index 767411ff9d8..00000000000 --- a/src/main/java/forge/ExternalPanel.java +++ /dev/null @@ -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 . - */ -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 serialVersionUID=9098962430872706173L. */ - private static final long serialVersionUID = 9098962430872706173L; - private final Component child, head; - private JFrame frame; - - /** - *

- * Constructor for ExternalPanel. - *

- * - * @param child - * a {@link java.awt.Component} object. - */ - public ExternalPanel(final Component child) { - this(child, BorderLayout.EAST); - } - - /** - *

- * Constructor for ExternalPanel. - *

- * - * @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); - } - - /** - *

- * setHeadSide. - *

- * - * @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(); - } - } -} diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 4241d03b992..c6539585104 100644 --- a/src/main/java/forge/GameAction.java +++ b/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 { *

* * @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 { *

* * @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) { diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 3cdb8207cac..d0cde5d8568 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/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 { *

* * @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 { *

* * @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 { *

* * @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 { *

* * @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 diff --git a/src/main/java/forge/GameEntity.java b/src/main/java/forge/GameEntity.java index 2425dd70643..031182831d4 100644 --- a/src/main/java/forge/GameEntity.java +++ b/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; /** *

diff --git a/src/main/java/forge/GuiDisplayUtil.java b/src/main/java/forge/GuiDisplayUtil.java index fc74a01aa17..fefb5bcdc12 100644 --- a/src/main/java/forge/GuiDisplayUtil.java +++ b/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) { diff --git a/src/main/java/forge/GuiInput.java b/src/main/java/forge/GuiInput.java index 4ce872573ea..c4fc6be010c 100644 --- a/src/main/java/forge/GuiInput.java +++ b/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; /** *

@@ -101,7 +103,7 @@ public class GuiInput extends MyObservable implements Observer { *

* * @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); diff --git a/src/main/java/forge/ImagePreviewPanel.java b/src/main/java/forge/ImagePreviewPanel.java deleted file mode 100644 index c807ae24abb..00000000000 --- a/src/main/java/forge/ImagePreviewPanel.java +++ /dev/null @@ -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 . - */ -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; - -/** - *

- * ImagePreviewPanel class. - *

- * - * @author Forge - * @version $Id$ - */ -public class ImagePreviewPanel extends JPanel implements PropertyChangeListener { - - /** Constant serialVersionUID=2163809931940286240L. */ - private static final long serialVersionUID = 2163809931940286240L; - private int width, height; - private ImageIcon icon; - private Image image; - /** Constant ACCSIZE=155. */ - private static final int ACCSIZE = 155; - private final Color bg; - - /** - *

- * Constructor for ImagePreviewPanel. - *

- */ - 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(); - } - } - } - - /** - *

- * scaleImage. - *

- */ - 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); - } - -} diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index f44462ee287..00fb4135050 100644 --- a/src/main/java/forge/MagicStack.java +++ b/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 { *

* * @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) { diff --git a/src/main/java/forge/Move.java b/src/main/java/forge/Move.java deleted file mode 100644 index 2a55d11629e..00000000000 --- a/src/main/java/forge/Move.java +++ /dev/null @@ -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 . - */ -package forge; - -/** - *

- * Abstract Move class. - *

- * - * @author Forge - * @version $Id$ - */ -public abstract class Move { - /** - *

- * generateMoves. - *

- * - * @return an array of {@link forge.Move} objects. - */ - public abstract Move[] generateMoves(); - - /** - *

- * getScore. - *

- * - * @return a int. - */ - public abstract int getScore(); - - /** The best move. */ - // private Move bestMove = null; - - /** The best score. */ - private int bestScore = Integer.MIN_VALUE; - - /** - *

- * min. - *

- * - * @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; - } - - /** - *

- * max. - *

- * - * @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() -} diff --git a/src/main/java/forge/SimpleCombat.java b/src/main/java/forge/SimpleCombat.java deleted file mode 100644 index b0de9fbc3f3..00000000000 --- a/src/main/java/forge/SimpleCombat.java +++ /dev/null @@ -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 . - */ -package forge; - -import java.util.HashMap; -import java.util.Iterator; - -/** - *

- * SimpleCombat class. - *

- * - * @author Forge - * @version $Id$ - */ -class SimpleCombat { - private final HashMap map = new HashMap(); - private final CardList attackers = new CardList(); - - /** - *

- * Constructor for SimpleCombat. - *

- */ - public SimpleCombat() { - } - - /** - *

- * Constructor for SimpleCombat. - *

- * - * @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)); - } - } - - /** - *

- * Getter for the field attackers. - *

- * - * @return a {@link forge.CardList} object. - */ - public CardList getAttackers() { - return this.attackers; - } - - /** - *

- * addAttacker. - *

- * - * @param c - * a {@link forge.Card} object. - */ - public void addAttacker(final Card c) { - this.attackers.add(c); - this.map.put(c, new CardList()); - } - - /** - *

- * getBlockers. - *

- * - * @param attacker - * a {@link forge.Card} object. - * @return a {@link forge.CardList} object. - */ - public CardList getBlockers(final Card attacker) { - return this.map.get(attacker); - } - - /** - *

- * addBlocker. - *

- * - * @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); - } - - /** - *

- * getUnblockedAttackers. - *

- * - * @return a {@link forge.CardList} object. - */ - public CardList getUnblockedAttackers() { - final CardList list = new CardList(); - final Iterator 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 - /** - *

- * combatDamage. - *

- * - * @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 diff --git a/src/main/java/forge/StaticEffect.java b/src/main/java/forge/StaticEffect.java index bca766af014..2a6ffdd719f 100644 --- a/src/main/java/forge/StaticEffect.java +++ b/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; /** *

diff --git a/src/main/java/forge/StaticEffects.java b/src/main/java/forge/StaticEffects.java index a487ec7df65..702d552de66 100644 --- a/src/main/java/forge/StaticEffects.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index d778148744c..238e57e8f41 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java index 51a187f8c63..39c443c6eaa 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java index 77b06504bb6..4a4f416fbfe 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java index 413dac274b5..2855ef63061 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index 31f1cf1660b..98d72cbfc56 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java +++ b/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 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 params = af.getMapParams(); diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java index cc91b409302..a1179cb3f51 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java index 49ad9f7f712..4fc5b58fdb6 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java index 4068a3bebd4..373e7652572 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCombat.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java index aff9e07fb31..cce978edfdc 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java index 4d8a670aacf..ff75bc26769 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java +++ b/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) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index c18d53fd260..0e1056372b8 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java index 8ee3ca1a3cd..adf12c130cb 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java +++ b/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. diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java index dbb5b4340fb..6aa0a799d5a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java index 0b76da9b1ed..30a98c99c57 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java index de02290e380..dbdb5895c4f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java index 3ef63b070b1..2fdb5931447 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java index d013495c3fc..2d6c117a9c8 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java +++ b/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) { diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java index a051c03df08..c126a3c2ace 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java +++ b/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 { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ private static boolean hasUrzaLands(final Player p) { diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java index c7470465f48..b2161afcbac 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java index 76e9f7d0e43..891eff7e801 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java index c66c392a8fa..c944bab02d0 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPreventDamage.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java index 4aff2d27bce..45416cc9501 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryProtection.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java index 72203043d37..fc73614e69c 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java index 9ee4fc2c5ec..f45da204673 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryRegenerate.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java index 41be1229b9b..2628610975f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java +++ b/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; diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java index 7bfe5d4ca74..b2424eaaf4e 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java +++ b/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 { *

* * @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 { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @param amount * a int. * @param valid diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java index c7e9695c7d5..c2a914d46d7 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java +++ b/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. diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java index 3b4673cfb54..519ba908fa8 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java +++ b/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; /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java index 51c243b1ac6..e38a203ca27 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java index a3cc9d689b2..fa41b576a77 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java +++ b/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; diff --git a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java index 6d4ab085609..38278830aad 100644 --- a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java +++ b/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 */ diff --git a/src/main/java/forge/card/cardfactory/CardFactoryAuras.java b/src/main/java/forge/card/cardfactory/CardFactoryAuras.java index 61730f2c768..7bcc37d8cf9 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryAuras.java +++ b/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; /** diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index f37392eed79..9ae97ac63e8 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/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; diff --git a/src/main/java/forge/card/cardfactory/CardFactoryInstants.java b/src/main/java/forge/card/cardfactory/CardFactoryInstants.java index 7baa633f45e..945ce6f95f5 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryInstants.java +++ b/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; diff --git a/src/main/java/forge/card/cardfactory/CardFactoryInterface.java b/src/main/java/forge/card/cardfactory/CardFactoryInterface.java index 567d366444b..f9f5e0aabea 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryInterface.java +++ b/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 { * @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 */ diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java index 2a7d5770692..aca5d8f7f14 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java +++ b/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; diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java index 8db4a89b8ae..ee082dc3605 100644 --- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java +++ b/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; /** diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index d38a15f51de..a1605ec94f3 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/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 { *

* * @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 { *

* * @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 { *

* * @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 { *

* * @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 diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index 8671d7a0965..0f2be885a0c 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 5b0c7eb14b5..5d1e6b2bd26 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/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; /** diff --git a/src/main/java/forge/card/cost/CostGainLife.java b/src/main/java/forge/card/cost/CostGainLife.java index 83f88884b49..96b19c0d01e 100644 --- a/src/main/java/forge/card/cost/CostGainLife.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 5368eed4121..41762ea7405 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostMill.java b/src/main/java/forge/card/cost/CostMill.java index eeb0b398209..01cf7dcf374 100644 --- a/src/main/java/forge/card/cost/CostMill.java +++ b/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 diff --git a/src/main/java/forge/card/cost/CostPart.java b/src/main/java/forge/card/cost/CostPart.java index b8b3066e89f..b47ef612e3f 100644 --- a/src/main/java/forge/card/cost/CostPart.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostPayLife.java b/src/main/java/forge/card/cost/CostPayLife.java index 80cc03607bd..29daabf338e 100644 --- a/src/main/java/forge/card/cost/CostPayLife.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostPayment.java b/src/main/java/forge/card/cost/CostPayment.java index d71c04ac0b1..2157d8e326e 100644 --- a/src/main/java/forge/card/cost/CostPayment.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index 861b1caa88a..dda985d818a 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostRemoveCounter.java b/src/main/java/forge/card/cost/CostRemoveCounter.java index f9beba26ea9..f5d0b696acd 100644 --- a/src/main/java/forge/card/cost/CostRemoveCounter.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index 81d3c596dcc..db7670b1c20 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index a28595ed58d..cc2400eb92f 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/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; /** diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index 557daebdb0f..7c52f920611 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostTap.java b/src/main/java/forge/card/cost/CostTap.java index 4bb20493f8f..d9edec8d870 100644 --- a/src/main/java/forge/card/cost/CostTap.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 0108fdf86ed..4d166118201 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostUntap.java b/src/main/java/forge/card/cost/CostUntap.java index e5f74cd10c5..f1e41c41ff1 100644 --- a/src/main/java/forge/card/cost/CostUntap.java +++ b/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. diff --git a/src/main/java/forge/card/cost/CostUtil.java b/src/main/java/forge/card/cost/CostUtil.java index 3331fe3e485..032c77e77b3 100644 --- a/src/main/java/forge/card/cost/CostUtil.java +++ b/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; /** diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java index 4aab6e1874c..524ebf68c08 100644 --- a/src/main/java/forge/card/mana/ManaPool.java +++ b/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 { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public ManaPool(final Player player) { owner = player; diff --git a/src/main/java/forge/card/replacement/ReplacementHandler.java b/src/main/java/forge/card/replacement/ReplacementHandler.java index 4adeb12cdfb..9dfb340b3ad 100644 --- a/src/main/java/forge/card/replacement/ReplacementHandler.java +++ b/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; /** diff --git a/src/main/java/forge/card/spellability/AbilityMana.java b/src/main/java/forge/card/spellability/AbilityMana.java index ca52683b999..c95d77f4416 100644 --- a/src/main/java/forge/card/spellability/AbilityMana.java +++ b/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; /** *

@@ -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(); diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java index 6caacc6180d..c9ab14504cb 100644 --- a/src/main/java/forge/card/spellability/Spell.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index adfee59fd62..9cfd1947820 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/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 activatingPlayer. *

* - * @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 { *

* * @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 { *

* * @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 targetPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public Player getTargetPlayer() { if (this.targetPlayer == null) { diff --git a/src/main/java/forge/card/spellability/SpellAbilityCondition.java b/src/main/java/forge/card/spellability/SpellAbilityCondition.java index 512f0811e05..bb907dc9a65 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityCondition.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbilityList.java b/src/main/java/forge/card/spellability/SpellAbilityList.java index 85698877e8b..d7e21c35348 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityList.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbilityRequirements.java b/src/main/java/forge/card/spellability/SpellAbilityRequirements.java index fdb5493145f..cef40d0260e 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityRequirements.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java index 29a092ad57e..422e9c1503e 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java b/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java index 7a504da9fd2..89b637e8bd3 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java +++ b/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; /** *

@@ -193,7 +193,7 @@ public class SpellAbilityStackInstance { * Getter for the field activatingPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getActivatingPlayer() { return this.activatingPlayer; diff --git a/src/main/java/forge/card/spellability/SpellPermanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java index f8067f066ee..8ae91ef0d9e 100644 --- a/src/main/java/forge/card/spellability/SpellPermanent.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java index 586aad7cb8e..05388b2578b 100644 --- a/src/main/java/forge/card/spellability/Target.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/spellability/TargetChoices.java b/src/main/java/forge/card/spellability/TargetChoices.java index 670c5ad456a..204acf3c88e 100644 --- a/src/main/java/forge/card/spellability/TargetChoices.java +++ b/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; /** *

@@ -94,7 +94,7 @@ public class TargetChoices { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public final boolean addTarget(final Player p) { diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index 93e473ea2d8..e9454cc8c25 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/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; /** diff --git a/src/main/java/forge/card/staticability/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java index 7c5b47c6b73..a6b60c72007 100644 --- a/src/main/java/forge/card/staticability/StaticAbility.java +++ b/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. diff --git a/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java b/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java index 441b56680fa..91f4336355d 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java +++ b/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. diff --git a/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java b/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java index d476c489944..e5bf195184c 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java +++ b/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. diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java index 27d6b54b688..705674e6167 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java +++ b/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. diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 4c8b06f8cbb..d335dd0492b 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index e048ade3c7a..f95d5a47f84 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/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; /** *

diff --git a/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java b/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java index d63149eb1d7..df83bb333e2 100644 --- a/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java +++ b/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; /** *

diff --git a/src/main/java/forge/control/ControlMatchUI.java b/src/main/java/forge/control/ControlMatchUI.java index 3e327acbce1..c497d3834e8 100644 --- a/src/main/java/forge/control/ControlMatchUI.java +++ b/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 */ diff --git a/src/main/java/forge/control/input/Input.java b/src/main/java/forge/control/input/Input.java index 775940e3013..e44c42ede79 100644 --- a/src/main/java/forge/control/input/Input.java +++ b/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; /** *

@@ -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 { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public void selectPlayer(final Player player) { } diff --git a/src/main/java/forge/control/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java index 2c789678b04..ac97b059797 100644 --- a/src/main/java/forge/control/input/InputAttack.java +++ b/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) { diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 1eb0727a392..c4ad5f10690 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/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; /** *

diff --git a/src/main/java/forge/control/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java index 10eebe3ed30..f3f1242a983 100644 --- a/src/main/java/forge/control/input/InputCleanup.java +++ b/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; /** diff --git a/src/main/java/forge/control/input/InputControl.java b/src/main/java/forge/control/input/InputControl.java index 54364bd8520..a9befbe71d1 100644 --- a/src/main/java/forge/control/input/InputControl.java +++ b/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; /** diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java index 694cb7adbb4..49ace6db941 100644 --- a/src/main/java/forge/control/input/InputMulligan.java +++ b/src/main/java/forge/control/input/InputMulligan.java @@ -24,19 +24,19 @@ import forge.AllZoneUtil; import forge.ButtonUtil; import forge.Card; import forge.CardList; -import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.GameAction; 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.GamePlayerRating; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseUtil; +import forge.game.player.ComputerUtil; +import forge.game.player.Player; +import forge.game.player.PlayerZone; import forge.quest.QuestController; import forge.quest.bazaar.QuestItemType; /** diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index d3a53f3408f..aaa314cf05f 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -21,10 +21,10 @@ import forge.AllZone; import forge.ButtonUtil; import forge.Card; import forge.GuiDisplayUtil; -import forge.Player; -import forge.PlayerZone; import forge.Singletons; import forge.game.phase.PhaseType; +import forge.game.player.Player; +import forge.game.player.PlayerZone; /** *

diff --git a/src/main/java/forge/control/input/InputPayManaCost.java b/src/main/java/forge/control/input/InputPayManaCost.java index 152a90c8193..e3878cbc243 100644 --- a/src/main/java/forge/control/input/InputPayManaCost.java +++ b/src/main/java/forge/control/input/InputPayManaCost.java @@ -21,13 +21,13 @@ import forge.AllZone; import forge.ButtonUtil; import forge.Card; import forge.Constant.Zone; -import forge.Player; -import forge.PlayerZone; import forge.Singletons; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; import forge.card.trigger.TriggerType; import forge.game.phase.PhaseHandler; +import forge.game.player.Player; +import forge.game.player.PlayerZone; //pays the cost of a card played from the player's hand //the card is removed from the players hand if the cost is paid diff --git a/src/main/java/forge/control/input/InputPayManaCostAbility.java b/src/main/java/forge/control/input/InputPayManaCostAbility.java index 4edf34dddfb..8ae311c208e 100644 --- a/src/main/java/forge/control/input/InputPayManaCostAbility.java +++ b/src/main/java/forge/control/input/InputPayManaCostAbility.java @@ -22,10 +22,10 @@ import forge.ButtonUtil; import forge.Card; import forge.Command; import forge.Constant.Zone; -import forge.PlayerZone; import forge.Singletons; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; +import forge.game.player.PlayerZone; //if cost is paid, Command.execute() is called diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java index 2249f3d0d50..89d505ac6e6 100644 --- a/src/main/java/forge/control/match/ControlField.java +++ b/src/main/java/forge/control/match/ControlField.java @@ -38,8 +38,6 @@ import forge.CardList; import forge.Constant; import forge.Constant.Zone; import forge.GuiDisplayUtil; -import forge.Player; -import forge.PlayerZone; import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; import forge.control.input.Input; @@ -48,6 +46,8 @@ import forge.control.input.InputBlock; import forge.control.input.InputMana; import forge.control.input.InputPayManaCost; import forge.control.input.InputPayManaCostAbility; +import forge.game.player.Player; +import forge.game.player.PlayerZone; import forge.gui.ForgeAction; import forge.gui.GuiUtils; import forge.gui.toolbox.FLabel; diff --git a/src/main/java/forge/control/match/ControlHand.java b/src/main/java/forge/control/match/ControlHand.java index 9982b916b43..7c30b96d405 100644 --- a/src/main/java/forge/control/match/ControlHand.java +++ b/src/main/java/forge/control/match/ControlHand.java @@ -38,8 +38,8 @@ import arcane.ui.util.Animation; import forge.AllZone; import forge.Card; import forge.Constant.Zone; -import forge.PlayerZone; import forge.Singletons; +import forge.game.player.PlayerZone; import forge.view.match.ViewHand; /** diff --git a/src/main/java/forge/deck/generate/Generate2ColorDeck.java b/src/main/java/forge/deck/generate/Generate2ColorDeck.java index 74cb7699af6..cb377cae234 100644 --- a/src/main/java/forge/deck/generate/Generate2ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate2ColorDeck.java @@ -19,11 +19,11 @@ package forge.deck.generate; import java.util.Arrays; import java.util.List; -import forge.PlayerType; import forge.card.CardColor; import forge.card.CardRules; import forge.deck.generate.GenerateDeckUtil.FilterCMC; import forge.error.ErrorViewer; +import forge.game.player.PlayerType; import forge.item.CardPrinted; import forge.item.ItemPoolView; import forge.properties.ForgeProps; diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java index eccdaf576d5..6244f87278e 100644 --- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java @@ -19,11 +19,11 @@ package forge.deck.generate; import java.util.Arrays; import java.util.List; -import forge.PlayerType; import forge.card.CardColor; import forge.card.CardRules; import forge.deck.generate.GenerateDeckUtil.FilterCMC; import forge.error.ErrorViewer; +import forge.game.player.PlayerType; import forge.item.CardPrinted; import forge.item.ItemPoolView; import forge.properties.ForgeProps; diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java index cda664c5a9a..586af5288f4 100644 --- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java @@ -19,11 +19,11 @@ package forge.deck.generate; import java.util.Arrays; import java.util.List; -import forge.PlayerType; import forge.card.CardColor; import forge.card.CardRules; import forge.deck.generate.GenerateDeckUtil.FilterCMC; import forge.error.ErrorViewer; +import forge.game.player.PlayerType; import forge.item.CardPrinted; import forge.item.ItemPoolView; import forge.properties.ForgeProps; diff --git a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java index c4f62ce3bd3..f118704bfe6 100644 --- a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java +++ b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java @@ -25,11 +25,11 @@ import java.util.Map.Entry; import java.util.Random; import forge.Constant; -import forge.PlayerType; import forge.Singletons; import forge.card.CardColor; import forge.card.CardRules; import forge.deck.generate.GenerateDeckUtil.FilterCMC; +import forge.game.player.PlayerType; import forge.item.CardDb; import forge.item.CardPrinted; import forge.item.ItemPool; diff --git a/src/main/java/forge/deck/io/DeckFileHeader.java b/src/main/java/forge/deck/io/DeckFileHeader.java index 5b0f147d96e..d1efb6a086a 100644 --- a/src/main/java/forge/deck/io/DeckFileHeader.java +++ b/src/main/java/forge/deck/io/DeckFileHeader.java @@ -17,8 +17,8 @@ */ package forge.deck.io; -import forge.PlayerType; import forge.game.GameType; +import forge.game.player.PlayerType; import forge.util.FileSection; /** diff --git a/src/main/java/forge/deck/io/OldDeckParser.java b/src/main/java/forge/deck/io/OldDeckParser.java index 30e8d28cc92..5ef7c16904d 100644 --- a/src/main/java/forge/deck/io/OldDeckParser.java +++ b/src/main/java/forge/deck/io/OldDeckParser.java @@ -30,9 +30,9 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; -import forge.PlayerType; import forge.deck.Deck; import forge.deck.DeckGroup; +import forge.game.player.PlayerType; import forge.util.FileSection; import forge.util.FileUtil; import forge.util.IStorage; diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index b28b58ffab4..b24a3f71a31 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -16,13 +16,13 @@ import forge.CardUtil; import forge.Constant; import forge.Constant.Zone; import forge.GameAction; -import forge.Player; import forge.Singletons; import forge.card.trigger.TriggerType; import forge.control.FControl; import forge.control.input.InputMulligan; import forge.deck.Deck; import forge.game.phase.PhaseHandler; +import forge.game.player.Player; import forge.gui.toolbox.FLabel; import forge.item.CardPrinted; import forge.properties.ForgePreferences.FPref; diff --git a/src/main/java/forge/game/GameState.java b/src/main/java/forge/game/GameState.java index 2832bf983d0..6a138758a7b 100644 --- a/src/main/java/forge/game/GameState.java +++ b/src/main/java/forge/game/GameState.java @@ -17,14 +17,9 @@ */ package forge.game; -import forge.AIPlayer; import forge.Constant; -import forge.DefaultPlayerZone; import forge.GameLog; -import forge.HumanPlayer; import forge.MagicStack; -import forge.Player; -import forge.PlayerZone; import forge.StaticEffects; import forge.card.replacement.ReplacementHandler; import forge.card.trigger.TriggerHandler; @@ -34,6 +29,11 @@ import forge.game.phase.EndOfTurn; import forge.game.phase.PhaseHandler; import forge.game.phase.Untap; import forge.game.phase.Upkeep; +import forge.game.player.AIPlayer; +import forge.game.player.DefaultPlayerZone; +import forge.game.player.HumanPlayer; +import forge.game.player.Player; +import forge.game.player.PlayerZone; /** * Represents the state of a single game and is diff --git a/src/main/java/forge/game/phase/Combat.java b/src/main/java/forge/game/phase/Combat.java index e810f5b11f8..1238240a12e 100644 --- a/src/main/java/forge/game/phase/Combat.java +++ b/src/main/java/forge/game/phase/Combat.java @@ -35,10 +35,10 @@ import forge.CardList; import forge.CardUtil; import forge.GameActionUtil; import forge.GameEntity; -import forge.Player; import forge.Singletons; import forge.Constant.Zone; import forge.card.trigger.TriggerType; +import forge.game.player.Player; /** *

@@ -110,7 +110,7 @@ public class Combat { *

* * @param defender - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void initiatePossibleDefenders(final Player defender) { this.defenders.add(defender); @@ -221,7 +221,7 @@ public class Combat { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setAttackingPlayer(final Player player) { this.attackingPlayer = player; @@ -233,7 +233,7 @@ public class Combat { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setDefendingPlayer(final Player player) { this.defendingPlayer = player; @@ -244,7 +244,7 @@ public class Combat { * Getter for the field attackingPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getAttackingPlayer() { if (this.attackingPlayer != null) { @@ -259,7 +259,7 @@ public class Combat { * Getter for the field defendingPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getDefendingPlayer() { if (this.attackingPlayer != null) { diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index 602c14b22d7..627a43d191b 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -31,15 +31,11 @@ import forge.Card; import forge.CardList; import forge.CardListFilter; import forge.Command; -import forge.ComputerUtil; import forge.Constant; import forge.Counters; import forge.GameAction; import forge.GameActionUtil; import forge.GameEntity; -import forge.Player; -import forge.PlayerUtil; -import forge.PlayerZone; import forge.Singletons; import forge.Constant.Zone; import forge.card.TriggerReplacementBase; @@ -51,6 +47,10 @@ import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; import forge.card.trigger.TriggerType; 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; /** @@ -926,7 +926,7 @@ public class CombatUtil { * @param attacker * a {@link forge.Card} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a int. */ public static int getTotalFirstStrikeBlockPower(final Card attacker, final Player player) { @@ -973,7 +973,7 @@ public class CombatUtil { * @param attacker * a {@link forge.Card} object. * @param attacked - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @param combat * a {@link forge.game.phase.Combat} object. * @return a int. @@ -1000,7 +1000,7 @@ public class CombatUtil { * @param attacker * a {@link forge.Card} object. * @param attacked - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @param combat * a {@link forge.game.phase.Combat} object. * @return a int. @@ -1030,7 +1030,7 @@ public class CombatUtil { * @param attackers * a {@link forge.CardList} object. * @param attacked - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a int. */ public static int sumDamageIfUnblocked(final CardList attackers, final Player attacked) { @@ -1050,7 +1050,7 @@ public class CombatUtil { * @param attackers * a {@link forge.CardList} object. * @param attacked - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a int. */ public static int sumPoisonIfUnblocked(final CardList attackers, final Player attacked) { diff --git a/src/main/java/forge/game/phase/EndOfTurn.java b/src/main/java/forge/game/phase/EndOfTurn.java index 944e16af958..8dc72c31ebc 100644 --- a/src/main/java/forge/game/phase/EndOfTurn.java +++ b/src/main/java/forge/game/phase/EndOfTurn.java @@ -24,11 +24,11 @@ import forge.CardList; import forge.CardListFilter; import forge.CardListUtil; import forge.Counters; -import forge.Player; import forge.Singletons; import forge.Constant.Zone; import forge.card.spellability.Ability; import forge.card.spellability.SpellAbility; +import forge.game.player.Player; import forge.gui.GuiUtils; /** diff --git a/src/main/java/forge/game/phase/Phase.java b/src/main/java/forge/game/phase/Phase.java index a27841652eb..98410f57886 100644 --- a/src/main/java/forge/game/phase/Phase.java +++ b/src/main/java/forge/game/phase/Phase.java @@ -21,8 +21,8 @@ import java.util.HashMap; import forge.Command; import forge.CommandList; -import forge.Player; import forge.Singletons; +import forge.game.player.Player; /** @@ -79,7 +79,7 @@ public abstract class Phase implements java.io.Serializable { *

* * @param p - * a {@link forge.Player} object + * a {@link forge.game.player.Player} object * @param c * a {@link forge.Command} object. */ diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 7b37c577f23..fec735e9fdf 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -30,10 +30,10 @@ import forge.CardList; import forge.CardListFilter; import forge.GameActionUtil; import forge.MyObservable; -import forge.Player; import forge.Singletons; import forge.Constant.Zone; import forge.card.trigger.TriggerType; +import forge.game.player.Player; import forge.properties.ForgePreferences.FPref; /** @@ -72,7 +72,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public final boolean isPlayerTurn(final Player player) { @@ -85,7 +85,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param s - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setPlayerTurn(final Player s) { this.playerTurn = s; @@ -96,7 +96,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * Getter for the field playerTurn. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getPlayerTurn() { return this.playerTurn; @@ -111,7 +111,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * getPriorityPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getPriorityPlayer() { return this.pPlayerPriority; @@ -123,7 +123,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setPriorityPlayer(final Player p) { this.pPlayerPriority = p; @@ -136,7 +136,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * getFirstPriority. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getFirstPriority() { return this.pFirstPriority; @@ -148,7 +148,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setFirstPriority(final Player p) { this.pFirstPriority = p; @@ -160,7 +160,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void setPriority(final Player p) { if (AllZone.getStack() != null) { @@ -592,7 +592,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * handleNextTurn. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ private Player handleNextTurn() { final Player nextTurn = this.extraTurns.isEmpty() ? this.getPlayerTurn().getOpponent() : this.extraTurns.pop(); @@ -614,8 +614,8 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param turn - * a {@link forge.Player} object. - * @return a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. + * @return a {@link forge.game.player.Player} object. */ private Player skipTurnTimeVault(Player turn) { // time vault: @@ -650,7 +650,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * @param phase * a {@link java.lang.String} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public final synchronized boolean is(final PhaseType phase, final Player player) { @@ -697,7 +697,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * getNextTurn. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public final Player getNextTurn() { if (this.extraTurns.isEmpty()) { @@ -713,7 +713,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param pl - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public final boolean isNextTurn(final Player pl) { @@ -727,7 +727,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void addExtraTurn(final Player player) { // use a stack to handle extra turns, make sure the bottom of the stack @@ -745,7 +745,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void skipTurn(final Player player) { // skipping turn without having extras is equivalent to giving your @@ -789,7 +789,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public final void resetAttackedThisCombat(final Player player) { // resets the status of attacked/blocked this phase @@ -904,7 +904,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public static boolean canCastSorcery(final Player player) { diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index 457deab8dc4..37a509c8841 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -24,12 +24,12 @@ import forge.AllZoneUtil; import forge.Card; import forge.CardList; import forge.CardListFilter; -import forge.Player; import forge.Singletons; import forge.Constant.Zone; import forge.card.trigger.TriggerType; import forge.control.ControlMatchUI; import forge.game.phase.PhaseType; +import forge.game.player.Player; import forge.view.match.ViewField.PhaseLabel; /** @@ -48,7 +48,7 @@ public class PhaseUtil { *

* * @param p - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ private static boolean skipUntap(final Player p) { @@ -183,7 +183,7 @@ public class PhaseUtil { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ private static boolean skipDraw(final Player player) { @@ -250,7 +250,7 @@ public class PhaseUtil { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ private static boolean skipCombat(final Player player) { diff --git a/src/main/java/forge/game/phase/Untap.java b/src/main/java/forge/game/phase/Untap.java index abbab3e2332..8b1a9e36b79 100644 --- a/src/main/java/forge/game/phase/Untap.java +++ b/src/main/java/forge/game/phase/Untap.java @@ -29,12 +29,12 @@ import forge.Constant; import forge.Counters; import forge.GameActionUtil; import forge.GameEntity; -import forge.Player; -import forge.PlayerZone; import forge.Singletons; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.control.input.Input; +import forge.game.player.Player; +import forge.game.player.PlayerZone; /** *

diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java index e5212b39fca..5c0042fd474 100644 --- a/src/main/java/forge/game/phase/Upkeep.java +++ b/src/main/java/forge/game/phase/Upkeep.java @@ -28,14 +28,10 @@ import forge.CardList; import forge.CardListFilter; import forge.CardListUtil; import forge.Command; -import forge.ComputerUtil; import forge.Constant; import forge.Counters; import forge.GameAction; import forge.GameActionUtil; -import forge.Player; -import forge.PlayerUtil; -import forge.PlayerZone; import forge.Singletons; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; @@ -45,6 +41,10 @@ import forge.card.spellability.AbilityStatic; import forge.card.spellability.SpellAbility; import forge.card.trigger.TriggerType; import forge.control.input.Input; +import forge.game.player.ComputerUtil; +import forge.game.player.Player; +import forge.game.player.PlayerUtil; +import forge.game.player.PlayerZone; import forge.gui.GuiUtils; /** diff --git a/src/main/java/forge/AIPlayer.java b/src/main/java/forge/game/player/AIPlayer.java similarity index 97% rename from src/main/java/forge/AIPlayer.java rename to src/main/java/forge/game/player/AIPlayer.java index b995b7846e8..c3b7d750190 100644 --- a/src/main/java/forge/AIPlayer.java +++ b/src/main/java/forge/game/player/AIPlayer.java @@ -15,10 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.Random; +import forge.AllZone; +import forge.Card; +import forge.CardList; +import forge.CardListFilter; +import forge.CardListUtil; +import forge.CardUtil; +import forge.Singletons; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; @@ -67,7 +74,7 @@ public class AIPlayer extends Player { * getOpponent. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ @Override public final Player getOpponent() { diff --git a/src/main/java/forge/Computer.java b/src/main/java/forge/game/player/Computer.java similarity index 98% rename from src/main/java/forge/Computer.java rename to src/main/java/forge/game/player/Computer.java index 342ea9a6b5f..8471e0cc316 100644 --- a/src/main/java/forge/Computer.java +++ b/src/main/java/forge/game/player/Computer.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; /** *

diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/game/player/ComputerAIGeneral.java similarity index 98% rename from src/main/java/forge/ComputerAIGeneral.java rename to src/main/java/forge/game/player/ComputerAIGeneral.java index 74d86e1fc13..d4878be9109 100644 --- a/src/main/java/forge/ComputerAIGeneral.java +++ b/src/main/java/forge/game/player/ComputerAIGeneral.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.ArrayList; import java.util.HashMap; @@ -23,6 +23,12 @@ import java.util.List; import com.esotericsoftware.minlog.Log; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.ComputerUtilBlock; +import forge.Singletons; import forge.Constant.Zone; import forge.card.abilityfactory.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; diff --git a/src/main/java/forge/ComputerAIInput.java b/src/main/java/forge/game/player/ComputerAIInput.java similarity index 95% rename from src/main/java/forge/ComputerAIInput.java rename to src/main/java/forge/game/player/ComputerAIInput.java index 4973c5f437e..1956d4a8601 100644 --- a/src/main/java/forge/ComputerAIInput.java +++ b/src/main/java/forge/game/player/ComputerAIInput.java @@ -15,10 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import com.esotericsoftware.minlog.Log; +import forge.AllZone; +import forge.Singletons; import forge.control.input.Input; import forge.game.phase.PhaseType; @@ -42,7 +44,7 @@ public class ComputerAIInput extends Input { *

* * @param iComputer - * a {@link forge.Computer} object. + * a {@link forge.game.player.Computer} object. */ public ComputerAIInput(final Computer iComputer) { this.computer = iComputer; @@ -77,7 +79,7 @@ public class ComputerAIInput extends Input { * Getter for the field computer. *

* - * @return a {@link forge.Computer} object. + * @return a {@link forge.game.player.Computer} object. */ public final Computer getComputer() { return this.computer; diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/game/player/ComputerUtil.java similarity index 99% rename from src/main/java/forge/ComputerUtil.java rename to src/main/java/forge/game/player/ComputerUtil.java index 3e37a83715d..64b12ae366a 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/game/player/ComputerUtil.java @@ -15,13 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.CardListFilter; +import forge.CardListUtil; +import forge.CardUtil; +import forge.ComputerUtilBlock; +import forge.Constant; +import forge.GameAction; +import forge.Singletons; import forge.Constant.Zone; import forge.card.abilityfactory.AbilityFactory; import forge.card.cardfactory.CardFactoryUtil; @@ -452,7 +463,7 @@ public class ComputerUtil { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public static boolean canPayCost(final SpellAbility sa, final Player player) { @@ -484,7 +495,7 @@ public class ComputerUtil { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a int. * @since 1.0.15 */ @@ -523,7 +534,7 @@ public class ComputerUtil { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public static boolean canPayAdditionalCosts(final SpellAbility sa, final Player player) { @@ -557,7 +568,7 @@ public class ComputerUtil { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @param test * (is for canPayCost, if true does not change the game state) * @param extraMana @@ -909,7 +920,7 @@ public class ComputerUtil { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a {@link forge.CardList} object. */ public static CardList getAvailableMana(final Player player) { @@ -1078,7 +1089,7 @@ public class ComputerUtil { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return HashMap */ public static HashMap> mapManaSources(final Player player) { diff --git a/src/main/java/forge/ComputerUtilAttack.java b/src/main/java/forge/game/player/ComputerUtilAttack.java similarity index 99% rename from src/main/java/forge/ComputerUtilAttack.java rename to src/main/java/forge/game/player/ComputerUtilAttack.java index d7f9955ae1a..f485af8f0b8 100644 --- a/src/main/java/forge/ComputerUtilAttack.java +++ b/src/main/java/forge/game/player/ComputerUtilAttack.java @@ -15,11 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.List; import java.util.Random; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.CardListFilter; +import forge.CardListUtil; +import forge.Constant; +import forge.Counters; +import forge.GameEntity; +import forge.Singletons; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.card.trigger.Trigger; @@ -715,7 +725,7 @@ public class ComputerUtilAttack { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a int. */ public final int countExaltedBonus(final Player player) { diff --git a/src/main/java/forge/DefaultPlayerZone.java b/src/main/java/forge/game/player/DefaultPlayerZone.java similarity index 97% rename from src/main/java/forge/DefaultPlayerZone.java rename to src/main/java/forge/game/player/DefaultPlayerZone.java index fab4b98b36c..e82485f1213 100644 --- a/src/main/java/forge/DefaultPlayerZone.java +++ b/src/main/java/forge/game/player/DefaultPlayerZone.java @@ -15,12 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.ArrayList; import java.util.List; import java.util.Observable; +import forge.AllZone; +import forge.Card; +import forge.CardList; +import forge.Constant; +import forge.Singletons; import forge.Constant.Zone; import forge.card.trigger.TriggerType; @@ -53,7 +58,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl * @param zone * a {@link java.lang.String} object. * @param inPlayer - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public DefaultPlayerZone(final Constant.Zone zone, final Player inPlayer) { this.zoneName = zone; @@ -251,7 +256,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl * @param zone * a {@link java.lang.String} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean */ @Override @@ -264,7 +269,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl * Getter for the field player. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ @Override public final Player getPlayer() { diff --git a/src/main/java/forge/HumanPlayer.java b/src/main/java/forge/game/player/HumanPlayer.java similarity index 97% rename from src/main/java/forge/HumanPlayer.java rename to src/main/java/forge/game/player/HumanPlayer.java index 0112e3d9e36..b16a34263cf 100644 --- a/src/main/java/forge/HumanPlayer.java +++ b/src/main/java/forge/game/player/HumanPlayer.java @@ -15,8 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; +import forge.AllZone; +import forge.Card; +import forge.CardList; +import forge.GameActionUtil; +import forge.Singletons; import forge.Constant.Zone; import forge.card.spellability.SpellAbility; import forge.control.input.Input; @@ -65,7 +70,7 @@ public class HumanPlayer extends Player { * getOpponent. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ @Override public final Player getOpponent() { diff --git a/src/main/java/forge/IPlayerZone.java b/src/main/java/forge/game/player/IPlayerZone.java similarity index 95% rename from src/main/java/forge/IPlayerZone.java rename to src/main/java/forge/game/player/IPlayerZone.java index e66fcfc4ebb..5a713e39033 100644 --- a/src/main/java/forge/IPlayerZone.java +++ b/src/main/java/forge/game/player/IPlayerZone.java @@ -15,10 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.List; +import forge.Card; +import forge.Constant; + /** *

* IPlayerZone interface. @@ -188,7 +191,7 @@ interface IPlayerZone { * @param zone * a {@link java.lang.String} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ boolean is(Constant.Zone zone, Player player); @@ -198,7 +201,7 @@ interface IPlayerZone { * getPlayer. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ Player getPlayer(); // the Player that owns this zone diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/game/player/Player.java similarity index 99% rename from src/main/java/forge/Player.java rename to src/main/java/forge/game/player/Player.java index bf1595bea55..8be3ba0063f 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +29,18 @@ import java.util.Random; import javax.swing.JOptionPane; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.CardUtil; +import forge.Constant; +import forge.GameActionUtil; +import forge.GameEntity; +import forge.HandSizeOp; +import forge.Singletons; +import forge.Constant.Color; +import forge.Constant.Runtime; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaPool; @@ -219,7 +231,7 @@ public abstract class Player extends GameEntity { *

* * @param p1 - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public final boolean isPlayer(final Player p1) { @@ -231,7 +243,7 @@ public abstract class Player extends GameEntity { * getOpponent. *

* - * @return a {@link forge.Player} object. + * @return a {@link forge.game.player.Player} object. */ public abstract Player getOpponent(); diff --git a/src/main/java/forge/PlayerType.java b/src/main/java/forge/game/player/PlayerType.java similarity index 97% rename from src/main/java/forge/PlayerType.java rename to src/main/java/forge/game/player/PlayerType.java index c21d9b8f248..cd5498463aa 100644 --- a/src/main/java/forge/PlayerType.java +++ b/src/main/java/forge/game/player/PlayerType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; /** * The Enum PlayerType. diff --git a/src/main/java/forge/PlayerUtil.java b/src/main/java/forge/game/player/PlayerUtil.java similarity index 97% rename from src/main/java/forge/PlayerUtil.java rename to src/main/java/forge/game/player/PlayerUtil.java index 122e9fb7f84..93a2346611e 100644 --- a/src/main/java/forge/PlayerUtil.java +++ b/src/main/java/forge/game/player/PlayerUtil.java @@ -15,8 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; +import forge.AllZone; +import forge.ButtonUtil; +import forge.Card; +import forge.CardList; +import forge.CardListFilter; +import forge.Constant; +import forge.Singletons; import forge.Constant.Zone; import forge.card.spellability.SpellAbility; import forge.control.input.Input; @@ -41,7 +48,7 @@ public final class PlayerUtil { *

* * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. * @return a boolean. */ public static boolean worshipFlag(final Player player) { diff --git a/src/main/java/forge/PlayerZone.java b/src/main/java/forge/game/player/PlayerZone.java similarity index 94% rename from src/main/java/forge/PlayerZone.java rename to src/main/java/forge/game/player/PlayerZone.java index fd8cb19729b..34cc7c485b6 100644 --- a/src/main/java/forge/PlayerZone.java +++ b/src/main/java/forge/game/player/PlayerZone.java @@ -15,10 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.Observer; +import forge.MyObservable; + //PlayerZone observers the cards that are added to its zone /** *

diff --git a/src/main/java/forge/PlayerZoneComesIntoPlay.java b/src/main/java/forge/game/player/PlayerZoneComesIntoPlay.java similarity index 97% rename from src/main/java/forge/PlayerZoneComesIntoPlay.java rename to src/main/java/forge/game/player/PlayerZoneComesIntoPlay.java index 011c8abb598..8382877c3b0 100644 --- a/src/main/java/forge/PlayerZoneComesIntoPlay.java +++ b/src/main/java/forge/game/player/PlayerZoneComesIntoPlay.java @@ -15,11 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge; +package forge.game.player; import java.util.ArrayList; import java.util.List; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.CardListFilter; +import forge.Command; +import forge.Constant; +import forge.Counters; +import forge.GameActionUtil; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.Ability; @@ -49,7 +58,7 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone { * @param zone * a {@link java.lang.String} object. * @param player - * a {@link forge.Player} object. + * a {@link forge.game.player.Player} object. */ public PlayerZoneComesIntoPlay(final Constant.Zone zone, final Player player) { super(zone, player); diff --git a/src/main/java/forge/gui/deckeditor/MenuCommon.java b/src/main/java/forge/gui/deckeditor/MenuCommon.java index b61f6f139d1..fd678dc8838 100644 --- a/src/main/java/forge/gui/deckeditor/MenuCommon.java +++ b/src/main/java/forge/gui/deckeditor/MenuCommon.java @@ -28,11 +28,11 @@ import javax.swing.SwingUtilities; import forge.CardList; import forge.Command; -import forge.PlayerType; import forge.deck.Deck; import forge.deck.generate.Generate2ColorDeck; import forge.deck.io.DeckSerializer; import forge.error.ErrorViewer; +import forge.game.player.PlayerType; /** *

diff --git a/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java b/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java index 29e49e9be30..f4548286780 100644 --- a/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java +++ b/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java @@ -26,7 +26,6 @@ import org.apache.commons.lang3.ArrayUtils; import forge.AllZone; import forge.Command; import forge.Constant; -import forge.PlayerType; import forge.Singletons; import forge.deck.Deck; import forge.deck.generate.Generate2ColorDeck; @@ -34,6 +33,7 @@ import forge.deck.generate.Generate3ColorDeck; import forge.deck.generate.Generate5ColorDeck; import forge.deck.generate.GenerateThemeDeck; import forge.game.GameNew; +import forge.game.player.PlayerType; import forge.gui.OverlayUtils; import forge.gui.home.ICSubmenu; import forge.gui.toolbox.FLabel; diff --git a/src/main/java/forge/item/CardPrinted.java b/src/main/java/forge/item/CardPrinted.java index dd78903051f..6f91efd885f 100644 --- a/src/main/java/forge/item/CardPrinted.java +++ b/src/main/java/forge/item/CardPrinted.java @@ -27,9 +27,9 @@ import forge.AllZone; import forge.Card; import forge.CardCharactersticName; import forge.CardUtil; -import forge.Player; import forge.card.CardRarity; import forge.card.CardRules; +import forge.game.player.Player; import forge.util.Lambda1; import forge.util.MyRandom; import forge.util.Predicate; diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index fe9a8859251..814c70f5b96 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -27,8 +27,6 @@ import java.util.List; import arcane.util.MultiplexOutputStream; import forge.AllZone; -import forge.ComputerAIGeneral; -import forge.ComputerAIInput; import forge.Constant; import forge.GameAction; import forge.Singletons; @@ -41,6 +39,8 @@ import forge.control.input.InputControl; import forge.deck.CardCollections; import forge.game.GameState; import forge.game.GameSummary; +import forge.game.player.ComputerAIGeneral; +import forge.game.player.ComputerAIInput; import forge.gui.toolbox.FSkin; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; diff --git a/src/main/java/forge/quest/QuestUtil.java b/src/main/java/forge/quest/QuestUtil.java index 60f3bc39d6f..c7277a5fbb0 100644 --- a/src/main/java/forge/quest/QuestUtil.java +++ b/src/main/java/forge/quest/QuestUtil.java @@ -21,8 +21,8 @@ import forge.AllZone; import forge.Card; import forge.CardList; import forge.CardUtil; -import forge.Player; import forge.card.cardfactory.AbstractCardFactory; +import forge.game.player.Player; import forge.quest.bazaar.QuestPetController; import java.util.List; diff --git a/src/main/java/forge/view/match/QuestWinLoseHandler.java b/src/main/java/forge/view/match/QuestWinLoseHandler.java index 3c3636704c8..9f7ff58b75e 100644 --- a/src/main/java/forge/view/match/QuestWinLoseHandler.java +++ b/src/main/java/forge/view/match/QuestWinLoseHandler.java @@ -20,7 +20,6 @@ import forge.AllZone; import forge.CardList; import forge.Constant; import forge.Constant.Zone; -import forge.Player; import forge.Singletons; import forge.control.FControl; import forge.control.match.ControlWinLose; @@ -31,6 +30,7 @@ import forge.game.GameLossReason; import forge.game.GameNew; import forge.game.GamePlayerRating; import forge.game.GameSummary; +import forge.game.player.Player; import forge.gui.GuiUtils; import forge.gui.ListChooser; import forge.gui.OverlayUtils; diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index 76bd411dcef..3962858bc0d 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -37,11 +37,11 @@ import net.miginfocom.swing.MigLayout; import arcane.ui.PlayArea; import forge.AllZone; import forge.Constant.Zone; -import forge.Player; import forge.Singletons; import forge.card.cardfactory.CardFactoryUtil; import forge.card.mana.ManaPool; import forge.control.match.ControlField; +import forge.game.player.Player; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FSkin; diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index 9690c3b2abb..ed77853f80e 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -51,10 +51,10 @@ import forge.CardUtil; import forge.Constant.Zone; import forge.GameLog; import forge.MagicStack; -import forge.Player; import forge.Singletons; import forge.card.spellability.SpellAbilityStackInstance; import forge.control.match.ControlTabber; +import forge.game.player.Player; import forge.gui.ForgeAction; import forge.gui.MultiLineLabelUI; import forge.gui.toolbox.FSkin; diff --git a/src/main/java/forge/view/match/ViewWinLose.java b/src/main/java/forge/view/match/ViewWinLose.java index 957fbedac7d..c535d824778 100644 --- a/src/main/java/forge/view/match/ViewWinLose.java +++ b/src/main/java/forge/view/match/ViewWinLose.java @@ -12,11 +12,11 @@ import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.Constant; -import forge.Player; import forge.Singletons; import forge.control.match.ControlWinLose; import forge.game.GameType; import forge.game.phase.PhaseHandler; +import forge.game.player.Player; import forge.gui.OverlayUtils; import forge.gui.toolbox.FButton; import forge.gui.toolbox.FLabel;