From 93c7d287142e3dc81f5dac6d6680a04985dcad70 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 19 Dec 2013 23:17:04 +0000 Subject: [PATCH] moved limited play to a different package (since they don't belong to game module) --- .gitattributes | 30 +++++++++---------- .../java/forge/game/limited/package-info.java | 3 -- .../controllers/CEditorDraftingProcess.java | 4 +-- .../gui/home/sanctioned/CSubmenuDraft.java | 4 +-- .../gui/home/sanctioned/CSubmenuSealed.java | 8 ++--- .../java/forge/gui/match/LimitedWinLose.java | 2 +- .../itemmanager/views/SColumnUtil.java | 2 +- .../limited/BoosterDeckBuilder.java | 2 +- .../{game => }/limited/BoosterDraft.java | 2 +- .../{game => }/limited/BoosterDraftAI.java | 2 +- .../limited/CardRankingComparator.java | 2 +- .../{game => }/limited/CustomLimited.java | 2 +- .../forge/{game => }/limited/DeckColors.java | 2 +- .../{game => }/limited/DraftRankCache.java | 2 +- .../{game => }/limited/GauntletMini.java | 2 +- .../{game => }/limited/IBoosterDraft.java | 2 +- .../limited/LimitedDeckBuilder.java | 2 +- .../{game => }/limited/LimitedPoolType.java | 2 +- .../{game => }/limited/ReadDraftRankings.java | 2 +- .../limited/SealedCardPoolGenerator.java | 2 +- .../{game => }/limited/SealedDeckBuilder.java | 2 +- .../main/java/forge/limited/package-info.java | 3 ++ .../src/main/java/forge/model/FModel.java | 2 +- .../src/main/java/forge/model/MetaSet.java | 2 +- .../test/java/forge/BoosterDraft1Test.java | 4 +-- .../src/test/java/forge/BoosterDraftTest.java | 2 +- 26 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 forge-gui/src/main/java/forge/game/limited/package-info.java rename forge-gui/src/main/java/forge/{game => }/limited/BoosterDeckBuilder.java (88%) rename forge-gui/src/main/java/forge/{game => }/limited/BoosterDraft.java (99%) rename forge-gui/src/main/java/forge/{game => }/limited/BoosterDraftAI.java (99%) rename forge-gui/src/main/java/forge/{game => }/limited/CardRankingComparator.java (89%) rename forge-gui/src/main/java/forge/{game => }/limited/CustomLimited.java (99%) rename forge-gui/src/main/java/forge/{game => }/limited/DeckColors.java (98%) rename forge-gui/src/main/java/forge/{game => }/limited/DraftRankCache.java (89%) rename forge-gui/src/main/java/forge/{game => }/limited/GauntletMini.java (95%) rename forge-gui/src/main/java/forge/{game => }/limited/IBoosterDraft.java (98%) rename forge-gui/src/main/java/forge/{game => }/limited/LimitedDeckBuilder.java (97%) rename forge-gui/src/main/java/forge/{game => }/limited/LimitedPoolType.java (88%) rename forge-gui/src/main/java/forge/{game => }/limited/ReadDraftRankings.java (96%) rename forge-gui/src/main/java/forge/{game => }/limited/SealedCardPoolGenerator.java (99%) rename forge-gui/src/main/java/forge/{game => }/limited/SealedDeckBuilder.java (99%) create mode 100644 forge-gui/src/main/java/forge/limited/package-info.java diff --git a/.gitattributes b/.gitattributes index 146bee10c51..85b76be240e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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/IGameEventVisitor.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/ManaCostBeingPaid.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/VCardScript.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/CardBlock.java -text forge-gui/src/main/java/forge/model/CardCollections.java -text diff --git a/forge-gui/src/main/java/forge/game/limited/package-info.java b/forge-gui/src/main/java/forge/game/limited/package-info.java deleted file mode 100644 index 64d9dd48bdc..00000000000 --- a/forge-gui/src/main/java/forge/game/limited/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package forge.game.limited; - diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index 2b8e77c5955..b5bb6fae31f 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -26,8 +26,6 @@ import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; -import forge.game.limited.BoosterDraft; -import forge.game.limited.IBoosterDraft; import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.views.VAllDecks; 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.item.PaperCard; import forge.item.InventoryItem; +import forge.limited.BoosterDraft; +import forge.limited.IBoosterDraft; import forge.util.ItemPoolView; /** diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java index f2b9aefaccb..959c7c90b8b 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java @@ -16,8 +16,6 @@ import forge.deck.Deck; import forge.deck.DeckGroup; import forge.game.GameType; import forge.game.Match; -import forge.game.limited.BoosterDraft; -import forge.game.limited.LimitedPoolType; import forge.game.player.RegisteredPlayer; import forge.gui.GuiChoose; import forge.gui.SOverlayUtils; @@ -25,6 +23,8 @@ import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.controllers.CEditorDraftingProcess; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; +import forge.limited.BoosterDraft; +import forge.limited.LimitedPoolType; import forge.net.FServer; import forge.net.Lobby; import forge.properties.ForgePreferences.FPref; diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java index 6251cdc8a51..1cd3b374f93 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java @@ -22,10 +22,6 @@ import forge.deck.DeckBase; import forge.deck.DeckGroup; import forge.deck.DeckSection; 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.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.controllers.ACEditorBase; @@ -34,6 +30,10 @@ import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.item.PaperCard; 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.util.ItemPool; import forge.util.storage.IStorage; diff --git a/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java b/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java index 113d188f0b4..698977a708e 100644 --- a/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java @@ -26,9 +26,9 @@ import javax.swing.SwingConstants; import forge.Singletons; import forge.game.Game; -import forge.game.limited.GauntletMini; import forge.gui.SOverlayUtils; import forge.gui.toolbox.FSkin; +import forge.limited.GauntletMini; import forge.net.FServer; /** diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java index fd0b8947ade..4a08a43f51c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java @@ -36,12 +36,12 @@ import forge.card.CardRarity; import forge.card.CardRules; import forge.card.ColorSet; import forge.card.mana.ManaCost; -import forge.game.limited.DraftRankCache; import forge.gui.toolbox.itemmanager.SItemManagerIO; import forge.item.PaperCard; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.item.InventoryItemFromSet; +import forge.limited.DraftRankCache; /** * A collection of methods pertaining to columns in card catalog and diff --git a/forge-gui/src/main/java/forge/game/limited/BoosterDeckBuilder.java b/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java similarity index 88% rename from forge-gui/src/main/java/forge/game/limited/BoosterDeckBuilder.java rename to forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java index a72c6e649a6..8f1d7d135ca 100644 --- a/forge-gui/src/main/java/forge/game/limited/BoosterDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java similarity index 99% rename from forge-gui/src/main/java/forge/game/limited/BoosterDraft.java rename to forge-gui/src/main/java/forge/limited/BoosterDraft.java index 28966c09f0a..c7e6f2564f6 100644 --- a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.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.game.limited; +package forge.limited; import java.io.File; import java.util.ArrayList; diff --git a/forge-gui/src/main/java/forge/game/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java similarity index 99% rename from forge-gui/src/main/java/forge/game/limited/BoosterDraftAI.java rename to forge-gui/src/main/java/forge/limited/BoosterDraftAI.java index a838e745418..48f8c01e5b5 100644 --- a/forge-gui/src/main/java/forge/game/limited/BoosterDraftAI.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.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.game.limited; +package forge.limited; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/limited/CardRankingComparator.java b/forge-gui/src/main/java/forge/limited/CardRankingComparator.java similarity index 89% rename from forge-gui/src/main/java/forge/game/limited/CardRankingComparator.java rename to forge-gui/src/main/java/forge/limited/CardRankingComparator.java index f1cfcde96c6..4ce2ff9d468 100644 --- a/forge-gui/src/main/java/forge/game/limited/CardRankingComparator.java +++ b/forge-gui/src/main/java/forge/limited/CardRankingComparator.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; import java.util.Comparator; diff --git a/forge-gui/src/main/java/forge/game/limited/CustomLimited.java b/forge-gui/src/main/java/forge/limited/CustomLimited.java similarity index 99% rename from forge-gui/src/main/java/forge/game/limited/CustomLimited.java rename to forge-gui/src/main/java/forge/limited/CustomLimited.java index f9717ea6172..cb5e389b837 100644 --- a/forge-gui/src/main/java/forge/game/limited/CustomLimited.java +++ b/forge-gui/src/main/java/forge/limited/CustomLimited.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.game.limited; +package forge.limited; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/limited/DeckColors.java b/forge-gui/src/main/java/forge/limited/DeckColors.java similarity index 98% rename from forge-gui/src/main/java/forge/game/limited/DeckColors.java rename to forge-gui/src/main/java/forge/limited/DeckColors.java index f4c598802e1..fda524518b2 100644 --- a/forge-gui/src/main/java/forge/game/limited/DeckColors.java +++ b/forge-gui/src/main/java/forge/limited/DeckColors.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.game.limited; +package forge.limited; import forge.card.ColorSet; import forge.card.MagicColor; diff --git a/forge-gui/src/main/java/forge/game/limited/DraftRankCache.java b/forge-gui/src/main/java/forge/limited/DraftRankCache.java similarity index 89% rename from forge-gui/src/main/java/forge/game/limited/DraftRankCache.java rename to forge-gui/src/main/java/forge/limited/DraftRankCache.java index 2457fe3c98b..0667ded617a 100644 --- a/forge-gui/src/main/java/forge/game/limited/DraftRankCache.java +++ b/forge-gui/src/main/java/forge/limited/DraftRankCache.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; /** * DraftRankCache diff --git a/forge-gui/src/main/java/forge/game/limited/GauntletMini.java b/forge-gui/src/main/java/forge/limited/GauntletMini.java similarity index 95% rename from forge-gui/src/main/java/forge/game/limited/GauntletMini.java rename to forge-gui/src/main/java/forge/limited/GauntletMini.java index 810524c415c..593df2f9eb0 100644 --- a/forge-gui/src/main/java/forge/game/limited/GauntletMini.java +++ b/forge-gui/src/main/java/forge/limited/GauntletMini.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.game.limited; +package forge.limited; import java.util.ArrayList; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/limited/IBoosterDraft.java b/forge-gui/src/main/java/forge/limited/IBoosterDraft.java similarity index 98% rename from forge-gui/src/main/java/forge/game/limited/IBoosterDraft.java rename to forge-gui/src/main/java/forge/limited/IBoosterDraft.java index 8a73a1af6f9..1d216ea1552 100644 --- a/forge-gui/src/main/java/forge/game/limited/IBoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/IBoosterDraft.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.game.limited; +package forge.limited; import forge.card.CardEdition; import forge.deck.Deck; diff --git a/forge-gui/src/main/java/forge/game/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java similarity index 97% rename from forge-gui/src/main/java/forge/game/limited/LimitedDeckBuilder.java rename to forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index b8b72753f8e..2d1b06a2412 100644 --- a/forge-gui/src/main/java/forge/game/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; import java.util.ArrayList; import java.util.Collections; diff --git a/forge-gui/src/main/java/forge/game/limited/LimitedPoolType.java b/forge-gui/src/main/java/forge/limited/LimitedPoolType.java similarity index 88% rename from forge-gui/src/main/java/forge/game/limited/LimitedPoolType.java rename to forge-gui/src/main/java/forge/limited/LimitedPoolType.java index b7e06e7160a..ae5d2402238 100644 --- a/forge-gui/src/main/java/forge/game/limited/LimitedPoolType.java +++ b/forge-gui/src/main/java/forge/limited/LimitedPoolType.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; public enum LimitedPoolType { Full("Full Cardpool"), diff --git a/forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java similarity index 96% rename from forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java rename to forge-gui/src/main/java/forge/limited/ReadDraftRankings.java index 33204212ed2..f2bf55426f1 100644 --- a/forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java +++ b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; import java.util.HashMap; import java.util.List; diff --git a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java similarity index 99% rename from forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java rename to forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java index b309dc8eb00..b0e43638c10 100644 --- a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.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.game.limited; +package forge.limited; import java.io.File; import java.util.ArrayList; diff --git a/forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java similarity index 99% rename from forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java rename to forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java index 58d5e250d5b..84ecb79f657 100644 --- a/forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java @@ -1,4 +1,4 @@ -package forge.game.limited; +package forge.limited; import java.util.ArrayList; import java.util.Arrays; diff --git a/forge-gui/src/main/java/forge/limited/package-info.java b/forge-gui/src/main/java/forge/limited/package-info.java new file mode 100644 index 00000000000..1323ddca75b --- /dev/null +++ b/forge-gui/src/main/java/forge/limited/package-info.java @@ -0,0 +1,3 @@ +/** Forge Card Game. */ +package forge.limited; + diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 5e81a1c28eb..36683b7f5a8 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -31,8 +31,8 @@ import forge.ai.AiProfileUtil; import forge.card.CardType; import forge.error.ExceptionHandler; import forge.game.GameFormat; -import forge.game.limited.GauntletMini; import forge.gauntlet.GauntletData; +import forge.limited.GauntletMini; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.properties.NewConstants; diff --git a/forge-gui/src/main/java/forge/model/MetaSet.java b/forge-gui/src/main/java/forge/model/MetaSet.java index fd1d6001739..8ec69f26be2 100644 --- a/forge-gui/src/main/java/forge/model/MetaSet.java +++ b/forge-gui/src/main/java/forge/model/MetaSet.java @@ -25,10 +25,10 @@ import com.google.common.base.Predicate; import forge.Singletons; import forge.card.IUnOpenedProduct; import forge.card.UnOpenedProduct; -import forge.game.limited.CustomLimited; import forge.item.PaperCard; import forge.item.IPaperCard; import forge.item.SealedProduct; +import forge.limited.CustomLimited; import forge.util.FileUtil; /** diff --git a/forge-gui/src/test/java/forge/BoosterDraft1Test.java b/forge-gui/src/test/java/forge/BoosterDraft1Test.java index 0329f4fd131..6b94b585c5a 100644 --- a/forge-gui/src/test/java/forge/BoosterDraft1Test.java +++ b/forge-gui/src/test/java/forge/BoosterDraft1Test.java @@ -2,9 +2,9 @@ package forge; import org.testng.annotations.Test; -import forge.game.limited.BoosterDraft; -import forge.game.limited.LimitedPoolType; import forge.item.PaperCard; +import forge.limited.BoosterDraft; +import forge.limited.LimitedPoolType; import forge.util.ItemPoolView; /** diff --git a/forge-gui/src/test/java/forge/BoosterDraftTest.java b/forge-gui/src/test/java/forge/BoosterDraftTest.java index 1ae6fcd9272..7bdc75800f1 100644 --- a/forge-gui/src/test/java/forge/BoosterDraftTest.java +++ b/forge-gui/src/test/java/forge/BoosterDraftTest.java @@ -7,9 +7,9 @@ import org.testng.annotations.Test; import forge.card.BoosterGenerator; import forge.deck.Deck; import forge.game.card.Card; -import forge.game.limited.IBoosterDraft; import forge.item.PaperCard; import forge.item.SealedProduct; +import forge.limited.IBoosterDraft; import forge.util.ItemPool; import forge.util.ItemPoolView;