Organize imports

forge-core/src/main/java/forge/CardStorageReader.java

@@ -41,10 +41,12 @@ import java.util.concurrent.Future;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import forge.util.BuildInfo;
 import org.apache.commons.lang3.time.StopWatch;
+
 import com.google.common.io.Files;
+
 import forge.card.CardRules;
+import forge.util.BuildInfo;
 import forge.util.FileUtil;
 import forge.util.Localizer;
 import forge.util.ThreadUtil;

forge-core/src/main/java/forge/ImageKeys.java

@@ -1,17 +1,16 @@
 package forge;
 
-import forge.item.*;
-import forge.util.FileUtil;
-import forge.util.ImageUtil;
-import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-
-
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+
+import forge.item.PaperCard;
+import forge.util.FileUtil;
+import forge.util.ImageUtil;
+import forge.util.TextUtil;
+
 public final class ImageKeys {
     public static final String CARD_PREFIX           = "c:";
     public static final String TOKEN_PREFIX          = "t:";

forge-core/src/main/java/forge/MulliganDefs.java

@@ -1,9 +1,9 @@
 package forge;
 
-import com.google.common.collect.Lists;
-
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 /*
  * A class that contains definitions of available Mulligan rule variants and helper methods to access them
  */

forge-core/src/main/java/forge/StaticData.java

@@ -1,11 +1,20 @@
 package forge;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 import com.google.common.base.Predicate;
+
 import forge.card.CardDb;
+import forge.card.CardDb.CardRequest;
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.PrintSheet;
-import forge.card.CardDb.CardRequest;
 import forge.item.BoosterBox;
 import forge.item.FatPack;
 import forge.item.PaperCard;
@@ -14,9 +23,6 @@ import forge.token.TokenDb;
 import forge.util.storage.IStorage;
 import forge.util.storage.StorageBase;
 
-import java.io.File;
-import java.util.*;
-
 
 /**
  * The class holding game invariants, such as cards, editions, game formats. All that data, which is not supposed to be changed by player

forge-core/src/main/java/forge/card/CardDb.java

@@ -17,18 +17,39 @@
  */
 package forge.card;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Predicate;
-import com.google.common.collect.*;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimaps;
+
 import forge.card.CardEdition.CardInSet;
 import forge.card.CardEdition.Type;
 import forge.deck.generation.IDeckGenPool;
 import forge.item.PaperCard;
-import forge.util.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.*;
-import java.util.Map.Entry;
+import forge.util.Aggregates;
+import forge.util.CollectionSuppliers;
+import forge.util.Lang;
+import forge.util.MyRandom;
+import forge.util.TextUtil;
 
 public final class CardDb implements ICardDatabase, IDeckGenPool {
     public final static String foilSuffix = "+";

forge-core/src/main/java/forge/card/CardEdition.java

@@ -17,28 +17,50 @@
  */
 package forge.card;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
-import com.google.common.collect.*;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Lists;
+
 import forge.StaticData;
 import forge.card.CardDb.SetPreference;
 import forge.deck.CardPool;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
-import forge.util.*;
+import forge.util.Aggregates;
+import forge.util.FileSection;
+import forge.util.FileUtil;
+import forge.util.IItemReader;
+import forge.util.MyRandom;
 import forge.util.storage.StorageBase;
 import forge.util.storage.StorageReaderBase;
 import forge.util.storage.StorageReaderFolder;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 /**

forge-core/src/main/java/forge/card/CardFace.java

@@ -1,10 +1,15 @@
 package forge.card;
 
-import forge.card.mana.ManaCost;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.*;
-import java.util.Map.Entry;
+import forge.card.mana.ManaCost;
 
 //
 // DO NOT AUTOFORMAT / CHECKSTYLE THIS FILE

forge-core/src/main/java/forge/card/CardRules.java

@@ -17,14 +17,16 @@
  */
 package forge.card;
 
+import java.util.StringTokenizer;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.collect.Iterables;
+
 import forge.card.mana.IParserManaCost;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.StringTokenizer;
 
 /**
  * A collection of methods containing full

forge-core/src/main/java/forge/card/CardType.java

@@ -30,7 +30,6 @@ import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;

forge-core/src/main/java/forge/card/ColorSet.java

@@ -18,7 +18,12 @@
 package forge.card;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
 
 import com.google.common.collect.UnmodifiableIterator;
 

forge-core/src/main/java/forge/card/DeckHints.java

@@ -1,18 +1,20 @@
 package forge.card;
 
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-import forge.item.PaperCard;
-import forge.util.PredicateString.StringOp;
-import org.apache.commons.lang3.tuple.Pair;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterables;
+
+import forge.item.PaperCard;
+import forge.util.PredicateString.StringOp;
+
 /**
  * DeckHints provides the ability for a Card to "want" another Card or type of
  * Cards in its random deck.

forge-core/src/main/java/forge/card/ICardDatabase.java

@@ -1,13 +1,14 @@
 package forge.card;
 
-import com.google.common.base.Predicate;
-import forge.card.CardDb.SetPreference;
-import forge.item.PaperCard;
-
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import com.google.common.base.Predicate;
+
+import forge.card.CardDb.SetPreference;
+import forge.item.PaperCard;
+
 public interface ICardDatabase extends Iterable<PaperCard> {
     PaperCard getCard(String cardName);
     PaperCard getCard(String cardName, String edition);

forge-core/src/main/java/forge/card/PrintSheet.java

@@ -1,6 +1,13 @@
 package forge.card;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map.Entry;
+
 import com.google.common.base.Function;
+
 import forge.deck.CardPool;
 import forge.item.PaperCard;
 import forge.util.ItemPool;
@@ -9,12 +16,6 @@ import forge.util.storage.IStorage;
 import forge.util.storage.StorageExtendable;
 import forge.util.storage.StorageReaderFileSections;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
-
 
 /**
  * TODO: Write javadoc for this type.

forge-core/src/main/java/forge/deck/CardPool.java

@@ -17,16 +17,6 @@
  */
 package forge.deck;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
-import forge.StaticData;
-import forge.card.CardDb;
-import forge.item.PaperCard;
-import forge.util.ItemPool;
-import forge.util.ItemPoolSorter;
-import forge.util.MyRandom;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -34,6 +24,18 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Lists;
+
+import forge.StaticData;
+import forge.card.CardDb;
+import forge.item.PaperCard;
+import forge.util.ItemPool;
+import forge.util.ItemPoolSorter;
+import forge.util.MyRandom;
+
 
 public class CardPool extends ItemPool<PaperCard> {
     private static final long serialVersionUID = -5379091255613968393L;

forge-core/src/main/java/forge/deck/Deck.java

@@ -17,6 +17,16 @@
  */
 package forge.deck;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
@@ -25,9 +35,6 @@ import forge.card.CardDb;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 
-import java.util.*;
-import java.util.Map.Entry;
-
 /**
  * <p>
  * Deck class.

forge-core/src/main/java/forge/deck/DeckBase.java

@@ -17,11 +17,12 @@
  */
 package forge.deck;
 
-import forge.item.InventoryItem;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+import forge.item.InventoryItem;
+
 public abstract class DeckBase implements Serializable, Comparable<DeckBase>, InventoryItem {
     private static final long serialVersionUID = -7538150536939660052L;
     // gameType is from Constant.GameType, like GameType.Regular

forge-core/src/main/java/forge/deck/DeckFormat.java

@@ -17,10 +17,20 @@
  */
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.lang3.Range;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+
 import forge.StaticData;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -33,14 +43,6 @@ import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.util.Aggregates;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.Range;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
 
 /**
  * GameType is an enum to determine the type of current game. :)

forge-core/src/main/java/forge/deck/DeckGroup.java

@@ -17,8 +17,13 @@
  */
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import com.google.common.base.Function;
-import java.util.*;
 
 /**
  * TODO: Write javadoc for this type.

forge-core/src/main/java/forge/deck/DeckRecognizer.java

@@ -17,17 +17,18 @@
  */
 package forge.deck;
 
-import forge.card.CardDb;
-import forge.card.CardDb.SetPreference;
-import forge.card.ICardDatabase;
-import forge.item.PaperCard;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Calendar;
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+
+import forge.card.CardDb;
+import forge.card.CardDb.SetPreference;
+import forge.card.ICardDatabase;
+import forge.item.PaperCard;
+
 /**
  * <p>
  * DeckRecognizer class.

forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java

@@ -17,6 +17,11 @@
  */
 package forge.deck.generation;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
@@ -24,15 +29,9 @@ import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.deck.CardPool;
 import forge.deck.DeckFormat;
-
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * <p>
  * Generate2ColorDeck class.

forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java

@@ -17,6 +17,10 @@
  */
 package forge.deck.generation;
 
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
@@ -27,10 +31,6 @@ import forge.deck.DeckFormat;
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.List;
-
 /**
  * <p>
  * Generate3ColorDeck class.

forge-core/src/main/java/forge/deck/generation/DeckGenerator4Color.java

@@ -17,17 +17,19 @@
  */
 package forge.deck.generation;
 
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
+
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.deck.CardPool;
 import forge.deck.DeckFormat;
 import forge.item.PaperCard;
 import forge.util.MyRandom;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.List;
 
 /**
  * <p>

forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java

@@ -17,17 +17,17 @@
  */
 package forge.deck.generation;
 
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
 import forge.card.ColorSet;
 import forge.deck.CardPool;
 import forge.deck.DeckFormat;
-
 import forge.item.PaperCard;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.List;
 
 /**
  * <p>

forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java

@@ -17,13 +17,29 @@
  */
 package forge.deck.generation;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import forge.StaticData;
 
-import forge.card.*;
+import forge.StaticData;
+import forge.card.CardRules;
+import forge.card.CardRulesPredicates;
+import forge.card.CardType;
+import forge.card.ColorSet;
+import forge.card.MagicColor;
 import forge.card.mana.ManaCost;
 import forge.deck.CardPool;
 import forge.deck.DeckFormat;
@@ -34,13 +50,6 @@ import forge.util.DebugTrace;
 import forge.util.ItemPool;
 import forge.util.MyRandom;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * <p>
  * Generate2ColorDeck class.

forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java

@@ -17,6 +17,10 @@
  */
 package forge.deck.generation;
 
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
@@ -24,14 +28,9 @@ import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.deck.CardPool;
 import forge.deck.DeckFormat;
-
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.List;
-
 /**
  * <p>
  * Generate2ColorDeck class.

forge-core/src/main/java/forge/deck/io/DeckFileHeader.java

@@ -17,13 +17,14 @@
  */
 package forge.deck.io;
 
-import forge.deck.DeckFormat;
-import forge.util.FileSection;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.commons.lang3.StringUtils;
+
+import forge.deck.DeckFormat;
+import forge.util.FileSection;
+
 /**
  * TODO: Write javadoc for this type.
  * 

forge-core/src/main/java/forge/deck/io/DeckGroupSerializer.java

@@ -17,6 +17,12 @@
  */
 package forge.deck.io;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.collect.ImmutableList;
 
 import forge.deck.Deck;
@@ -24,12 +30,6 @@ import forge.deck.DeckGroup;
 import forge.util.IItemSerializer;
 import forge.util.storage.StorageReaderFolder;
 
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.List;
-
 /**
  * TODO: Write javadoc for this type.
  * 

forge-core/src/main/java/forge/deck/io/DeckSerializer.java

@@ -1,5 +1,13 @@
 package forge.deck.io;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang3.StringUtils;
+
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -7,13 +15,6 @@ import forge.util.FileSection;
 import forge.util.FileSectionManual;
 import forge.util.FileUtil;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 public class DeckSerializer {
 

forge-core/src/main/java/forge/deck/io/DeckStorage.java

@@ -17,6 +17,11 @@
  */
 package forge.deck.io;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
+import java.util.Map;
+
 import forge.deck.Deck;
 import forge.util.FileSection;
 import forge.util.FileUtil;
@@ -24,11 +29,6 @@ import forge.util.IItemReader;
 import forge.util.IItemSerializer;
 import forge.util.storage.StorageReaderFolder;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.List;
-import java.util.Map;
-
 /**
  * This class knows how to make a file out of a deck object and vice versa.
  */

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

@@ -18,13 +18,15 @@
 
 package forge.item;
 
+import java.util.ArrayList;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
+
 import forge.ImageKeys;
 import forge.StaticData;
 import forge.card.CardEdition;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
 
 public class BoosterBox extends BoxedProduct {
     public static final Function<CardEdition, BoosterBox> FN_FROM_SET = new Function<CardEdition, BoosterBox>() {

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

@@ -18,6 +18,8 @@
 
 package forge.item;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
@@ -27,8 +29,6 @@ import forge.card.CardEdition;
 import forge.item.generation.BoosterSlots;
 import forge.util.MyRandom;
 
-import org.apache.commons.lang3.tuple.Pair;
-
 public class BoosterPack extends SealedProduct {
     private final int artIndex;
     private final int hash;

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

@@ -18,18 +18,20 @@
 
 package forge.item;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
+
 import forge.ImageKeys;
 import forge.StaticData;
 import forge.card.CardEdition;
 import forge.item.generation.BoosterGenerator;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class FatPack extends BoxedProduct {
     public static final Function<CardEdition, FatPack> FN_FROM_SET = new Function<CardEdition, FatPack>() {

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

@@ -1,18 +1,20 @@
 package forge.item;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
+
 import forge.card.CardRarity;
 import forge.card.CardRules;
 import forge.card.CardType.CoreType;
 import forge.card.MagicColor;
 import forge.util.PredicateCard;
 import forge.util.PredicateString;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 //import forge.Card;
 

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

@@ -1,15 +1,16 @@
 package forge.item;
 
+import java.util.ArrayList;
+import java.util.Locale;
+
+import org.apache.commons.lang3.StringUtils;
+
 import forge.ImageKeys;
 import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.card.CardRules;
 import forge.card.ColorSet;
 import forge.util.MyRandom;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Locale;
 
 public class PaperToken implements InventoryItemFromSet, IPaperCard {
     private String name;

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

@@ -17,6 +17,11 @@
  */
 package forge.item;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.base.Function;
 
 import forge.ImageKeys;
@@ -28,11 +33,6 @@ import forge.util.FileSection;
 import forge.util.FileUtil;
 import forge.util.storage.StorageReaderFolder;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.List;
-import java.util.Map;
-
 
 public class PreconDeck implements InventoryItemFromSet {
     private final Deck deck;

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

@@ -18,11 +18,19 @@
 
 package forge.item;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+
 import forge.StaticData;
 import forge.card.CardRulesPredicates;
 import forge.item.generation.BoosterGenerator;
@@ -30,12 +38,6 @@ import forge.item.generation.BoosterSlots;
 import forge.util.Aggregates;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 public abstract class SealedProduct implements InventoryItemFromSet {
 

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

@@ -17,6 +17,8 @@
  */
 package forge.item;
 
+import java.util.List;
+
 import com.google.common.base.Function;
 
 import forge.ImageKeys;
@@ -24,8 +26,6 @@ import forge.StaticData;
 import forge.card.CardEdition;
 import forge.item.generation.BoosterGenerator;
 
-import java.util.List;
-
 public class TournamentPack extends SealedProduct {
 
     /** The Constant fnFromSet. */

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

@@ -17,18 +17,32 @@
  */
 package forge.item.generation;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 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.CardEdition.FoilType;
 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;
 import forge.item.PaperCard;
@@ -36,10 +50,6 @@ import forge.item.SealedProduct;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.*;
 
 /**
  * <p>

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

@@ -1,12 +1,12 @@
 package forge.item.generation;
 
+import java.util.List;
+
 import forge.card.CardEdition;
 import forge.item.BoosterPack;
 import forge.item.PaperCard;
 import forge.util.BagRandomizer;
 
-import java.util.List;
-
 public class ChaosBoosterSupplier implements IUnOpenedProduct {
     private BagRandomizer<CardEdition> randomizer;
 

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

@@ -1,10 +1,11 @@
 package forge.item.generation;
 
-import com.google.common.base.Supplier;
-import forge.item.PaperCard;
-
 import java.util.List;
 
+import com.google.common.base.Supplier;
+
+import forge.item.PaperCard;
+
 /**
  * TODO: Write javadoc for this type.
  *

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

@@ -1,19 +1,21 @@
 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;
-import org.apache.commons.lang3.tuple.Pair;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.commons.lang3.tuple.Pair;
+
+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;
+
 
 public class UnOpenedProduct implements IUnOpenedProduct {
 

forge-core/src/main/java/forge/token/ITokenDatabase.java

@@ -1,13 +1,14 @@
 package forge.token;
 
-import com.google.common.base.Predicate;
-import forge.card.CardDb;
-import forge.item.PaperToken;
-
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import com.google.common.base.Predicate;
+
+import forge.card.CardDb;
+import forge.item.PaperToken;
+
 public interface ITokenDatabase extends Iterable<PaperToken> {
     PaperToken getToken(String tokenName);
     PaperToken getToken(String tokenName, String edition);

forge-core/src/main/java/forge/token/TokenDb.java

@@ -1,14 +1,20 @@
 package forge.token;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
+
 import forge.card.CardDb;
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.item.PaperToken;
 
-import java.util.*;
-
 public class TokenDb implements ITokenDatabase {
     // Expected naming convention of scripts
     // token_name

forge-core/src/main/java/forge/util/Aggregates.java

@@ -1,11 +1,15 @@
 package forge.util;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
-import java.util.*;
-import java.util.Map.Entry;
-
 /** 
  * TODO: Write javadoc for this type.
  *

forge-core/src/main/java/forge/util/Base64Coder.java

@@ -31,12 +31,13 @@
 
 package forge.util;
 
+import java.nio.charset.StandardCharsets;
+
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
-import java.nio.charset.StandardCharsets;
 
 /**
  * A Base64 encoder/decoder.

forge-core/src/main/java/forge/util/CardTranslation.java

@@ -1,12 +1,16 @@
 package forge.util;
 
-import com.google.common.base.Charsets;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.base.Charsets;
 
 public class CardTranslation {
 

forge-core/src/main/java/forge/util/ComparatorUtil.java

@@ -1,6 +1,7 @@
 package forge.util;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Comparator;
 
 /**
  * @author Gili Tzabari

forge-core/src/main/java/forge/util/FileSection.java

@@ -17,8 +17,6 @@
  */
 package forge.util;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -31,6 +29,9 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+
 /**
  * TODO: Write javadoc for this type.
  * 

forge-core/src/main/java/forge/util/FileUtil.java

@@ -17,10 +17,17 @@
  */
 package forge.util;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,6 +35,9 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 /**
  * <p>
  * FileUtil class.

forge-core/src/main/java/forge/util/ItemPool.java

@@ -17,16 +17,21 @@
  */
 package forge.util;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 
 import forge.item.InventoryItem;
 
-import java.io.Serializable;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map.Entry;
-
 /**
  * <p>
  * ItemPool class.

forge-core/src/main/java/forge/util/ItemPoolSorter.java

@@ -17,12 +17,13 @@
  */
 package forge.util;
 
-import com.google.common.base.Function;
-import forge.item.PaperCard;
-
 import java.util.Comparator;
 import java.util.Map.Entry;
 
+import com.google.common.base.Function;
+
+import forge.item.PaperCard;
+
 
 /**
  * <p>

forge-core/src/main/java/forge/util/Lang.java

@@ -6,12 +6,17 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.util.lang.*;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import forge.util.lang.LangChinese;
+import forge.util.lang.LangEnglish;
+import forge.util.lang.LangGerman;
+import forge.util.lang.LangItalian;
+import forge.util.lang.LangJapanese;
+import forge.util.lang.LangSpanish;
+
 /**
  * Static library containing language-related utility methods.
  */

forge-core/src/main/java/forge/util/LineReader.java

@@ -21,8 +21,11 @@ package forge.util;
  * TODO: Write javadoc for this type.
  *
  */
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;

forge-core/src/main/java/forge/util/Localizer.java

@@ -8,7 +8,11 @@ import java.net.URLClassLoader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 public class Localizer {
 	

forge-core/src/main/java/forge/util/NameGenerator.java

@@ -1,12 +1,12 @@
 /** Random name generator for Forge. */
 package forge.util;
 
-import org.apache.commons.lang3.ArrayUtils;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 /**
  * @author Marc
  *

forge-core/src/main/java/forge/util/PredicateCard.java

@@ -18,6 +18,7 @@
 package forge.util;
 
 import com.google.common.base.Predicate;
+
 import forge.item.PaperCard;
 
 /**

forge-core/src/main/java/forge/util/PredicateString.java

@@ -17,9 +17,10 @@
  */
 package forge.util;
 
-import com.google.common.base.Predicate;
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.common.base.Predicate;
+
 /**
  * Special predicate class to perform string operations.
  * 

forge-core/src/main/java/forge/util/TextUtil.java

@@ -1,18 +1,18 @@
 package forge.util;
 
-import forge.item.PaperCard;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.ImmutableSortedMap;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.collect.ImmutableSortedMap;
+
+import forge.item.PaperCard;
+
 /** 
  * TODO: Write javadoc for this type.
  *

forge-core/src/main/java/forge/util/ThreadUtil.java

@@ -1,6 +1,13 @@
 package forge.util;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 public class ThreadUtil {
     static {

forge-core/src/main/java/forge/util/collect/FCollection.java

@@ -1,16 +1,25 @@
 package forge.util.collect;
 
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.io.Serializable;
-import java.util.*;
-
 /**
  * Collection with unique elements ({@link Set}) that maintains the order in
  * which the elements are added to it ({@link List}).

forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java

@@ -1,12 +1,12 @@
 package forge.util.maps;
 
-import com.google.common.base.Supplier;
-
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Supplier;
+
 public class EnumMapOfLists<K extends Enum<K>, V> extends EnumMap<K, Collection<V>> implements MapOfLists<K, V> {
     private final Supplier<? extends Collection<V>> factory;
     

forge-core/src/main/java/forge/util/maps/HashMapOfLists.java

@@ -1,12 +1,12 @@
 package forge.util.maps;
 
-import com.google.common.base.Supplier;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Supplier;
+
 public class HashMapOfLists<K, V> extends HashMap<K, Collection<V>> implements MapOfLists<K, V> {
 
     private final Supplier<? extends Collection<V>> factory;

forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java

@@ -1,16 +1,18 @@
 package forge.util.maps;
 
-import com.google.common.collect.Lists;
-import forge.util.collect.FCollection;
-import forge.util.collect.FCollectionView;
-import org.apache.commons.lang3.tuple.Pair;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.collect.Lists;
+
+import forge.util.collect.FCollection;
+import forge.util.collect.FCollectionView;
+
 
 public final class MapToAmountUtil {
 

forge-core/src/main/java/forge/util/storage/StorageBase.java

@@ -17,11 +17,16 @@
  */
 package forge.util.storage;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-import forge.util.IItemReader;
 
-import java.util.*;
+import forge.util.IItemReader;
 
 /**
  * <p>

forge-core/src/main/java/forge/util/storage/StorageExtendable.java

@@ -17,9 +17,9 @@
  */
 package forge.util.storage;
 
-import forge.util.IItemReader;
+import java.util.Map;
 
-import java.util.*;
+import forge.util.IItemReader;
 
 /**
  * <p>

forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java

@@ -17,12 +17,13 @@
  */
 package forge.util.storage;
 
+import java.io.File;
+
 import com.google.common.base.Function;
+
 import forge.util.IItemSerializer;
 import forge.util.TextUtil;
 
-import java.io.File;
-
 /**
  * <p>
  * StorageImmediatelySerialized class.

forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java

@@ -1,10 +1,10 @@
 package forge.util.storage;
 
-import com.google.common.base.Function;
-
 import java.io.File;
 import java.util.HashMap;
 
+import com.google.common.base.Function;
+
 public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     private final File thisFolder;
 

forge-core/src/main/java/forge/util/storage/StorageReaderBase.java

@@ -1,10 +1,11 @@
 package forge.util.storage;
 
+import java.io.File;
+
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
-import forge.util.IItemReader;
 
-import java.io.File;
+import forge.util.IItemReader;
 
 public abstract class StorageReaderBase<T> implements IItemReader<T> {
     protected final Function<? super T, String> keySelector;

forge-core/src/main/java/forge/util/storage/StorageReaderFile.java

@@ -17,16 +17,16 @@
  */
 package forge.util.storage;
 
-import com.google.common.base.Function;
-
-import forge.util.FileUtil;
-
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.File;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.base.Function;
+
+import forge.util.FileUtil;
+
 /**
  * This class treats every line of a given file as a source for a named object.
  * 

forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java

@@ -17,18 +17,18 @@
  */
 package forge.util.storage;
 
-import com.google.common.base.Function;
-
-import forge.util.FileUtil;
-
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.base.Function;
+
+import forge.util.FileUtil;
+
 /**
  * This class treats every line of a given file as a source for a named object.
  * 

forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java

@@ -17,14 +17,20 @@
  */
 package forge.util.storage;
 
-import com.google.common.base.Function;
-import forge.util.TextUtil;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.TreeMap;
+
+import com.google.common.base.Function;
+
+import forge.util.TextUtil;
 
 /**
  * This class treats every file in the given folder as a source for a named

forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java

@@ -17,14 +17,23 @@
  */
 package forge.util.storage;
 
-import com.google.common.base.Function;
-import forge.util.TextUtil;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeMap;
+
+import com.google.common.base.Function;
+
+import forge.util.TextUtil;
 
 /**
  * This class treats every file in the given folder as a source for a named