moved limited play to a different package (since they don't belong to game module)

This commit is contained in:
Maxmtg
2013-12-19 23:17:04 +00:00
parent 5d8225f041
commit 93c7d28714
26 changed files with 47 additions and 47 deletions

30
.gitattributes vendored
View File

@@ -15058,21 +15058,6 @@ forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java -text
forge-gui/src/main/java/forge/game/event/GameEventZone.java -text forge-gui/src/main/java/forge/game/event/GameEventZone.java -text
forge-gui/src/main/java/forge/game/event/IGameEventVisitor.java -text forge-gui/src/main/java/forge/game/event/IGameEventVisitor.java -text
forge-gui/src/main/java/forge/game/event/package-info.java -text forge-gui/src/main/java/forge/game/event/package-info.java -text
forge-gui/src/main/java/forge/game/limited/BoosterDeckBuilder.java -text
forge-gui/src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/CardRankingComparator.java -text
forge-gui/src/main/java/forge/game/limited/CustomLimited.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/DraftRankCache.java -text
forge-gui/src/main/java/forge/game/limited/GauntletMini.java -text
forge-gui/src/main/java/forge/game/limited/IBoosterDraft.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/LimitedDeckBuilder.java -text
forge-gui/src/main/java/forge/game/limited/LimitedPoolType.java -text
forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java -text
forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/limited/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/mana/Mana.java svneol=native#text/plain forge-gui/src/main/java/forge/game/mana/Mana.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java svneol=native#text/plain forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/mana/ManaPool.java svneol=native#text/plain forge-gui/src/main/java/forge/game/mana/ManaPool.java svneol=native#text/plain
@@ -15518,6 +15503,21 @@ forge-gui/src/main/java/forge/gui/workshop/menus/WorkshopFileMenu.java -text
forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java -text forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java -text
forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java -text forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java -text
forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java -text forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java -text
forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java -text
forge-gui/src/main/java/forge/limited/BoosterDraft.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/BoosterDraftAI.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/CardRankingComparator.java -text
forge-gui/src/main/java/forge/limited/CustomLimited.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/DeckColors.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/DraftRankCache.java -text
forge-gui/src/main/java/forge/limited/GauntletMini.java -text
forge-gui/src/main/java/forge/limited/IBoosterDraft.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java -text
forge-gui/src/main/java/forge/limited/LimitedPoolType.java -text
forge-gui/src/main/java/forge/limited/ReadDraftRankings.java -text
forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java svneol=native#text/plain
forge-gui/src/main/java/forge/limited/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/model/BuildInfo.java -text forge-gui/src/main/java/forge/model/BuildInfo.java -text
forge-gui/src/main/java/forge/model/CardBlock.java -text forge-gui/src/main/java/forge/model/CardBlock.java -text
forge-gui/src/main/java/forge/model/CardCollections.java -text forge-gui/src/main/java/forge/model/CardCollections.java -text

View File

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

View File

@@ -26,8 +26,6 @@ import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckGroup; import forge.deck.DeckGroup;
import forge.deck.DeckSection; import forge.deck.DeckSection;
import forge.game.limited.BoosterDraft;
import forge.game.limited.IBoosterDraft;
import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.CDeckEditorUI;
import forge.gui.deckeditor.views.VAllDecks; import forge.gui.deckeditor.views.VAllDecks;
import forge.gui.deckeditor.views.VCardCatalog; import forge.gui.deckeditor.views.VCardCatalog;
@@ -40,6 +38,8 @@ import forge.gui.toolbox.itemmanager.CardManager;
import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.SColumnUtil;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.limited.BoosterDraft;
import forge.limited.IBoosterDraft;
import forge.util.ItemPoolView; import forge.util.ItemPoolView;
/** /**

View File

@@ -16,8 +16,6 @@ import forge.deck.Deck;
import forge.deck.DeckGroup; import forge.deck.DeckGroup;
import forge.game.GameType; import forge.game.GameType;
import forge.game.Match; import forge.game.Match;
import forge.game.limited.BoosterDraft;
import forge.game.limited.LimitedPoolType;
import forge.game.player.RegisteredPlayer; import forge.game.player.RegisteredPlayer;
import forge.gui.GuiChoose; import forge.gui.GuiChoose;
import forge.gui.SOverlayUtils; import forge.gui.SOverlayUtils;
@@ -25,6 +23,8 @@ import forge.gui.deckeditor.CDeckEditorUI;
import forge.gui.deckeditor.controllers.CEditorDraftingProcess; import forge.gui.deckeditor.controllers.CEditorDraftingProcess;
import forge.gui.framework.FScreen; import forge.gui.framework.FScreen;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;
import forge.limited.BoosterDraft;
import forge.limited.LimitedPoolType;
import forge.net.FServer; import forge.net.FServer;
import forge.net.Lobby; import forge.net.Lobby;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;

View File

@@ -22,10 +22,6 @@ import forge.deck.DeckBase;
import forge.deck.DeckGroup; import forge.deck.DeckGroup;
import forge.deck.DeckSection; import forge.deck.DeckSection;
import forge.game.GameType; import forge.game.GameType;
import forge.game.limited.LimitedPoolType;
import forge.game.limited.ReadDraftRankings;
import forge.game.limited.SealedDeckBuilder;
import forge.game.limited.SealedCardPoolGenerator;
import forge.gui.GuiChoose; import forge.gui.GuiChoose;
import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.CDeckEditorUI;
import forge.gui.deckeditor.controllers.ACEditorBase; import forge.gui.deckeditor.controllers.ACEditorBase;
@@ -34,6 +30,10 @@ import forge.gui.framework.FScreen;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.limited.LimitedPoolType;
import forge.limited.ReadDraftRankings;
import forge.limited.SealedCardPoolGenerator;
import forge.limited.SealedDeckBuilder;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;

View File

@@ -26,9 +26,9 @@ import javax.swing.SwingConstants;
import forge.Singletons; import forge.Singletons;
import forge.game.Game; import forge.game.Game;
import forge.game.limited.GauntletMini;
import forge.gui.SOverlayUtils; import forge.gui.SOverlayUtils;
import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin;
import forge.limited.GauntletMini;
import forge.net.FServer; import forge.net.FServer;
/** /**

View File

@@ -36,12 +36,12 @@ import forge.card.CardRarity;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.limited.DraftRankCache;
import forge.gui.toolbox.itemmanager.SItemManagerIO; import forge.gui.toolbox.itemmanager.SItemManagerIO;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.InventoryItemFromSet; import forge.item.InventoryItemFromSet;
import forge.limited.DraftRankCache;
/** /**
* A collection of methods pertaining to columns in card catalog and * A collection of methods pertaining to columns in card catalog and

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
import java.util.List; import java.util.List;

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
import java.util.Comparator; import java.util.Comparator;

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
/** /**
* DraftRankCache * DraftRankCache

View File

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

View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package forge.game.limited; package forge.limited;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.deck.Deck; import forge.deck.Deck;

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
public enum LimitedPoolType { public enum LimitedPoolType {
Full("Full Cardpool"), Full("Full Cardpool"),

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

View File

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

View File

@@ -1,4 +1,4 @@
package forge.game.limited; package forge.limited;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

View File

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

View File

@@ -31,8 +31,8 @@ import forge.ai.AiProfileUtil;
import forge.card.CardType; import forge.card.CardType;
import forge.error.ExceptionHandler; import forge.error.ExceptionHandler;
import forge.game.GameFormat; import forge.game.GameFormat;
import forge.game.limited.GauntletMini;
import forge.gauntlet.GauntletData; import forge.gauntlet.GauntletData;
import forge.limited.GauntletMini;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.properties.NewConstants; import forge.properties.NewConstants;

View File

@@ -25,10 +25,10 @@ import com.google.common.base.Predicate;
import forge.Singletons; import forge.Singletons;
import forge.card.IUnOpenedProduct; import forge.card.IUnOpenedProduct;
import forge.card.UnOpenedProduct; import forge.card.UnOpenedProduct;
import forge.game.limited.CustomLimited;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.SealedProduct; import forge.item.SealedProduct;
import forge.limited.CustomLimited;
import forge.util.FileUtil; import forge.util.FileUtil;
/** /**

View File

@@ -2,9 +2,9 @@ package forge;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import forge.game.limited.BoosterDraft;
import forge.game.limited.LimitedPoolType;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.limited.BoosterDraft;
import forge.limited.LimitedPoolType;
import forge.util.ItemPoolView; import forge.util.ItemPoolView;
/** /**

View File

@@ -7,9 +7,9 @@ import org.testng.annotations.Test;
import forge.card.BoosterGenerator; import forge.card.BoosterGenerator;
import forge.deck.Deck; import forge.deck.Deck;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.limited.IBoosterDraft;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.item.SealedProduct; import forge.item.SealedProduct;
import forge.limited.IBoosterDraft;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.ItemPoolView; import forge.util.ItemPoolView;