Move booster generation code to a separate package

.gitattributes

@@ -178,8 +178,6 @@ forge-core/src/main/java/forge/FTrace.java -text
 forge-core/src/main/java/forge/ImageKeys.java -text
 forge-core/src/main/java/forge/LobbyPlayer.java -text
 forge-core/src/main/java/forge/StaticData.java -text
-forge-core/src/main/java/forge/card/BoosterGenerator.java svneol=native#text/plain
-forge-core/src/main/java/forge/card/BoosterSlots.java -text
 forge-core/src/main/java/forge/card/CardAiHints.java -text
 forge-core/src/main/java/forge/card/CardChangedType.java -text
 forge-core/src/main/java/forge/card/CardDb.java -text
@@ -199,10 +197,8 @@ forge-core/src/main/java/forge/card/ICardCharacteristics.java -text
 forge-core/src/main/java/forge/card/ICardDatabase.java -text
 forge-core/src/main/java/forge/card/ICardFace.java -text
 forge-core/src/main/java/forge/card/ICardRawAbilites.java -text
-forge-core/src/main/java/forge/card/IUnOpenedProduct.java -text
 forge-core/src/main/java/forge/card/MagicColor.java -text
 forge-core/src/main/java/forge/card/PrintSheet.java -text
-forge-core/src/main/java/forge/card/UnOpenedProduct.java -text
 forge-core/src/main/java/forge/card/mana/IParserManaCost.java -text
 forge-core/src/main/java/forge/card/mana/ManaAtom.java -text
 forge-core/src/main/java/forge/card/mana/ManaCost.java -text
@@ -243,6 +239,10 @@ forge-core/src/main/java/forge/item/PaperToken.java -text
 forge-core/src/main/java/forge/item/PreconDeck.java -text
 forge-core/src/main/java/forge/item/SealedProduct.java -text
 forge-core/src/main/java/forge/item/TournamentPack.java -text
+forge-core/src/main/java/forge/item/generation/BoosterGenerator.java -text
+forge-core/src/main/java/forge/item/generation/BoosterSlots.java -text
+forge-core/src/main/java/forge/item/generation/IUnOpenedProduct.java -text
+forge-core/src/main/java/forge/item/generation/UnOpenedProduct.java -text
 forge-core/src/main/java/forge/item/package-info.java -text
 forge-core/src/main/java/forge/util/Aggregates.java -text
 forge-core/src/main/java/forge/util/Base64Coder.java -text

forge-core/src/main/java/forge/item/BoosterPack.java

@@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableList;
 
 import forge.ImageKeys;
 import forge.StaticData;
-import forge.card.BoosterSlots;
 import forge.card.CardEdition;
+import forge.item.generation.BoosterSlots;
 import forge.util.MyRandom;
 
 import org.apache.commons.lang3.tuple.Pair;

forge-core/src/main/java/forge/item/FatPack.java

@@ -28,8 +28,8 @@ import com.google.common.base.Function;
 
 import forge.ImageKeys;
 import forge.StaticData;
-import forge.card.BoosterGenerator;
 import forge.card.CardEdition;
+import forge.item.generation.BoosterGenerator;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;
 

forge-core/src/main/java/forge/item/SealedProduct.java

@@ -24,9 +24,9 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.StaticData;
-import forge.card.BoosterGenerator;
-import forge.card.BoosterSlots;
 import forge.card.CardRulesPredicates;
+import forge.item.generation.BoosterGenerator;
+import forge.item.generation.BoosterSlots;
 import forge.util.Aggregates;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;

forge-core/src/main/java/forge/item/TournamentPack.java

@@ -21,8 +21,8 @@ import com.google.common.base.Function;
 
 import forge.ImageKeys;
 import forge.StaticData;
-import forge.card.BoosterGenerator;
 import forge.card.CardEdition;
+import forge.item.generation.BoosterGenerator;
 
 import java.util.List;
 

forge-core/src/main/java/forge/item/generation/BoosterGenerator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.card;
+package forge.item.generation;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -23,6 +23,11 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import forge.StaticData;
+import forge.card.CardEdition;
+import forge.card.CardRarity;
+import forge.card.CardRulesPredicates;
+import forge.card.CardSplitType;
+import forge.card.PrintSheet;
 import forge.card.CardEdition.FoilType;
 import forge.item.IPaperCard;
 import forge.item.IPaperCard.Predicates.Presets;
@@ -42,7 +47,7 @@ import java.util.*;
  * </p>
  *
  * @author Forge
- * @version $Id$
+ * @version $Id: BoosterGenerator.java 35014 2017-08-13 00:40:48Z Max mtg $
  */
 public class BoosterGenerator {
 

forge-core/src/main/java/forge/item/generation/BoosterSlots.java

@@ -1,4 +1,4 @@
-package forge.card;
+package forge.item.generation;
 
 public class BoosterSlots {
     public static final String LAND = "Land";

forge-core/src/main/java/forge/item/generation/IUnOpenedProduct.java

@@ -1,4 +1,4 @@
-package forge.card;
+package forge.item.generation;
 
 import com.google.common.base.Supplier;
 import forge.item.PaperCard;

forge-core/src/main/java/forge/item/generation/UnOpenedProduct.java

@@ -1,8 +1,9 @@
-package forge.card;
+package forge.item.generation;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import forge.StaticData;
+import forge.card.PrintSheet;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
 import forge.util.ItemPool;

forge-gui-desktop/src/test/java/forge/BoosterDraftTest.java

@@ -1,11 +1,11 @@
 package forge;
 
-import forge.card.BoosterGenerator;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.game.card.Card;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.item.generation.BoosterGenerator;
 import forge.limited.IBoosterDraft;
 import forge.model.FModel;
 

forge-gui/src/main/java/forge/limited/BoosterDraft.java

@@ -19,12 +19,12 @@ package forge.limited;
 
 import com.google.common.base.Supplier;
 import forge.card.CardEdition;
-import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedProduct;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.item.generation.IUnOpenedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.model.CardBlock;
 import forge.model.FModel;
 import forge.properties.ForgeConstants;

forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java

@@ -19,15 +19,15 @@ package forge.limited;
 
 import forge.assets.FSkinProp;
 import forge.card.CardEdition;
-import forge.card.IUnOpenedProduct;
 import forge.card.MagicColor;
-import forge.card.UnOpenedProduct;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckSection;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.item.generation.IUnOpenedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.model.CardBlock;
 import forge.model.FModel;
 import forge.model.UnOpenedMeta;

forge-gui/src/main/java/forge/model/CardBlock.java

@@ -21,10 +21,10 @@ import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 
 import forge.card.CardEdition;
-import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedProduct;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
+import forge.item.generation.IUnOpenedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;
 

forge-gui/src/main/java/forge/model/MetaSet.java

@@ -20,11 +20,11 @@ package forge.model;
 
 import com.google.common.base.Predicate;
 
-import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedProduct;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.item.generation.IUnOpenedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.limited.CustomLimited;
 import forge.limited.SealedCardPoolGenerator;
 import forge.properties.ForgeConstants;

forge-gui/src/main/java/forge/model/UnOpenedMeta.java

@@ -18,8 +18,8 @@
 
 package forge.model;
 
-import forge.card.IUnOpenedProduct;
 import forge.item.PaperCard;
+import forge.item.generation.IUnOpenedProduct;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
 import forge.util.gui.SGuiChoose;

forge-gui/src/main/java/forge/quest/QuestUtilCards.java

@@ -29,6 +29,8 @@ import forge.deck.DeckSection;
 import forge.game.GameFormat;
 import forge.item.*;
 import forge.item.SealedProduct.Template;
+import forge.item.generation.BoosterSlots;
+import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
 import forge.properties.ForgePreferences.FPref;
 import forge.quest.bazaar.QuestItemType;

forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java

@@ -32,9 +32,9 @@ import com.google.common.collect.Lists;
 
 import forge.GuiBase;
 import forge.card.CardEdition;
-import forge.card.UnOpenedProduct;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
 import forge.quest.data.QuestPreferences.QPref;
 import forge.quest.io.ReadPriceList;

forge-gui/src/main/java/forge/quest/QuestWinLoseController.java

@@ -3,10 +3,7 @@ package forge.quest;
 import com.google.common.collect.ImmutableList;
 import forge.LobbyPlayer;
 import forge.assets.FSkinProp;
-import forge.card.BoosterSlots;
 import forge.card.CardEdition;
-import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedProduct;
 import forge.game.GameEndReason;
 import forge.game.GameFormat;
 import forge.game.GameOutcome;
@@ -19,6 +16,9 @@ import forge.interfaces.IButton;
 import forge.interfaces.IWinLoseView;
 import forge.item.*;
 import forge.item.IPaperCard.Predicates;
+import forge.item.generation.BoosterSlots;
+import forge.item.generation.IUnOpenedProduct;
+import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.properties.ForgePreferences.FPref;