Organize imports

forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java

@@ -1,14 +1,15 @@
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import forge.card.CardEdition;
 import forge.deck.io.Archetype;
 import forge.game.GameFormat;
 import forge.item.PaperCard;
 import forge.model.FModel;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by maustin on 09/05/2017.

forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java

@@ -1,12 +1,18 @@
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import forge.StaticData;
 import forge.deck.io.Archetype;
 import forge.deck.io.CardThemedLDAIO;
 import forge.model.FModel;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.*;
 
 /**
  * Created by maustin on 09/05/2017.

forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java

@@ -1,9 +1,22 @@
 package forge.deck;
 
+import java.io.File;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.ArrayUtils;
+
 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.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.deck.io.CardThemedMatrixIO;
@@ -14,10 +27,6 @@ import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
 import forge.util.storage.IStorage;
 import forge.util.storage.StorageImmediatelySerialized;
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.io.File;
-import java.util.*;
 
 /**
  * Created by maustin on 09/05/2017.

forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java

@@ -1,13 +1,13 @@
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.item.PaperCard;
 import forge.model.FModel;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by maustin on 09/05/2017.
  */

forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java

@@ -1,8 +1,12 @@
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
+
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -11,9 +15,6 @@ import forge.item.PaperCard;
 import forge.model.FModel;
 import forge.util.ItemPool;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by maustin on 09/05/2017.
  */

forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java

@@ -17,16 +17,16 @@
  */
 package forge.deck;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.generation.IDeckGenPool;
 import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.MyRandom;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * <p>
  * ThemeDeckGenerator class.

forge-gui/src/main/java/forge/deck/DeckProxy.java

@@ -6,10 +6,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
-import forge.card.CardSplitType;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
@@ -21,6 +20,7 @@ import forge.StaticData;
 import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.card.CardRules;
+import forge.card.CardSplitType;
 import forge.card.CardType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;

forge-gui/src/main/java/forge/deck/DeckgenUtil.java

@@ -1,10 +1,21 @@
 package forge.deck;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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 forge.StaticData;
 import forge.card.CardDb;
 import forge.card.CardRules;
@@ -12,7 +23,12 @@ import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
-import forge.deck.generation.*;
+import forge.deck.generation.DeckGenerator2Color;
+import forge.deck.generation.DeckGenerator3Color;
+import forge.deck.generation.DeckGenerator5Color;
+import forge.deck.generation.DeckGeneratorBase;
+import forge.deck.generation.DeckGeneratorMonoColor;
+import forge.deck.generation.IDeckGenPool;
 import forge.deck.io.Archetype;
 import forge.game.GameFormat;
 import forge.game.GameType;
@@ -33,9 +49,6 @@ import forge.util.Aggregates;
 import forge.util.Lang;
 import forge.util.MyRandom;
 import forge.util.storage.IStorage;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.*;
 
 /** 
  * Utility collection for various types of decks.

forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java

@@ -3,7 +3,12 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;

forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java

@@ -3,7 +3,12 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;

forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java

@@ -3,7 +3,12 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;

forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java

@@ -3,7 +3,12 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;

forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java

@@ -3,7 +3,12 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;

forge-gui/src/main/java/forge/deck/io/Archetype.java

@@ -1,10 +1,10 @@
 package forge.deck.io;
 
-import org.apache.commons.lang3.tuple.Pair;
-
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 public class Archetype implements Serializable {
 
     static final long serialVersionUID = 1733769383530140352L;

forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java

@@ -1,13 +1,18 @@
 package forge.deck.io;
 
-import forge.game.GameFormat;
-import forge.localinstance.properties.ForgeConstants;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.io.*;
-import java.util.List;
-import java.util.Map;
+import forge.game.GameFormat;
+import forge.localinstance.properties.ForgeConstants;
 
 /**
  * Created by maustin on 11/05/2017.

forge-gui/src/main/java/forge/deck/io/DeckPreferences.java

@@ -1,10 +1,5 @@
 package forge.deck.io;
 
-import forge.deck.DeckProxy;
-import forge.deck.DeckType;
-import forge.localinstance.properties.ForgeConstants;
-import forge.util.XmlUtil;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.HashMap;
@@ -17,6 +12,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+import forge.deck.DeckProxy;
+import forge.deck.DeckType;
+import forge.localinstance.properties.ForgeConstants;
+import forge.util.XmlUtil;
+
 /** 
  * Preferences associated with individual decks
  *

forge-gui/src/main/java/forge/download/AutoUpdater.java

@@ -1,5 +1,22 @@
 package forge.download;
 
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.SwingUtilities;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.collect.ImmutableList;
 
 import forge.gui.GuiBase;
@@ -12,17 +29,6 @@ import forge.util.FileUtil;
 import forge.util.Localizer;
 import forge.util.WaitCallback;
 
-import org.apache.commons.lang3.StringUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.net.*;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class AutoUpdater {
     private final String SNAPSHOT_VERSION_INDEX = "https://snapshots.cardforge.org/";
     private final String SNAPSHOT_VERSION_URL = "https://snapshots.cardforge.org/version.txt";

forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletData.java

@@ -1,5 +1,12 @@
 package forge.gamemodes.gauntlet;
 
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
 
 import forge.deck.Deck;
@@ -9,13 +16,6 @@ import forge.gamemodes.match.HostedMatch;
 import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgeConstants;
 
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * Handles layout saving and loading.

forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java

@@ -16,24 +16,23 @@ import java.util.TreeMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import com.thoughtworks.xstream.converters.ConversionException;
-import com.thoughtworks.xstream.security.NoTypePermission;
-import com.thoughtworks.xstream.security.NullPermission;
-import com.thoughtworks.xstream.security.PrimitiveTypePermission;
-import forge.deck.Deck;
-import forge.deck.DeckSection;
-import forge.gui.error.BugReporter;
-
 import org.apache.commons.lang3.StringUtils;
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.NullPermission;
+import com.thoughtworks.xstream.security.PrimitiveTypePermission;
 
 import forge.deck.CardPool;
+import forge.deck.Deck;
+import forge.deck.DeckSection;
+import forge.gui.error.BugReporter;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;

forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java

@@ -1,7 +1,10 @@
 package forge.gamemodes.gauntlet;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import forge.deck.Deck;
 import forge.deck.DeckType;

forge-gui/src/main/java/forge/gamemodes/limited/ArchetypeDeckBuilder.java

@@ -1,12 +1,12 @@
 package forge.gamemodes.limited;
 
+import java.util.List;
+
 import forge.deck.DeckFormat;
 import forge.deck.io.Archetype;
 import forge.game.GameFormat;
 import forge.item.PaperCard;
 
-import java.util.List;
-
 public class ArchetypeDeckBuilder extends CardThemedDeckBuilder{
 
     private Archetype archetype;

forge-gui/src/main/java/forge/gamemodes/limited/BoosterDeckBuilder.java

@@ -1,10 +1,10 @@
 package forge.gamemodes.limited;
 
 
-import forge.item.PaperCard;
-
 import java.util.List;
 
+import forge.item.PaperCard;
+
 
 /**
  * Deck built from a Booster Draft.

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

@@ -17,9 +17,22 @@
  */
 package forge.gamemodes.limited;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Stack;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Iterables;
+
 import forge.StaticData;
 import forge.card.CardEdition;
 import forge.deck.CardPool;
@@ -37,13 +50,9 @@ import forge.model.CardBlock;
 import forge.model.FModel;
 import forge.util.FileUtil;
 import forge.util.ItemPool;
+import forge.util.Localizer;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
-import forge.util.Localizer;
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.io.File;
-import java.util.*;
 
 /**
  * Booster Draft Format.

forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java

@@ -1,19 +1,19 @@
 package forge.gamemodes.limited;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 
 import forge.card.ColorSet;
 import forge.card.DeckHints;
 import forge.card.MagicColor;
-import forge.gui.card.*;
 import forge.item.PaperCard;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 public class CardRanker {
 

forge-gui/src/main/java/forge/gamemodes/limited/CardRankingComparator.java

@@ -1,9 +1,10 @@
 package forge.gamemodes.limited;
 
-import forge.item.PaperCard;
+import java.util.Comparator;
+
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.Comparator;
+import forge.item.PaperCard;
 
 /**
  * Sorts cards by rank.

forge-gui/src/main/java/forge/gamemodes/limited/CardThemedCommanderDeckBuilder.java

@@ -1,8 +1,11 @@
 package forge.gamemodes.limited;
 
+import java.util.List;
+
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.deck.DeckFormat;
@@ -10,8 +13,6 @@ import forge.deck.generation.DeckGenPool;
 import forge.item.PaperCard;
 import forge.model.FModel;
 
-import java.util.List;
-
 /**
  * Created by maustin on 28/02/2018.
  */

forge-gui/src/main/java/forge/gamemodes/limited/CardThemedConquestDeckBuilder.java

@@ -1,8 +1,11 @@
 package forge.gamemodes.limited;
 
+import java.util.List;
+
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.deck.DeckFormat;
@@ -11,8 +14,6 @@ import forge.game.GameFormat;
 import forge.item.PaperCard;
 import forge.model.FModel;
 
-import java.util.List;
-
 /**
  * Created by maustin on 28/02/2018.
  */

forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java

@@ -1,9 +1,19 @@
 package forge.gamemodes.limited;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 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.CardEdition;
 import forge.card.CardRules;
@@ -20,15 +30,12 @@ import forge.deck.generation.DeckGenPool;
 import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.generation.IDeckGenPool;
 import forge.game.GameFormat;
-import forge.gui.card.*;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
 import forge.util.MyRandom;
 
-import java.util.*;
-
 /**
  * Limited format deck.
  */

forge-gui/src/main/java/forge/gamemodes/limited/CustomLimited.java

@@ -17,6 +17,13 @@
  */
 package forge.gamemodes.limited;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
 import forge.card.CardEdition;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
@@ -28,13 +35,6 @@ import forge.util.ItemPool;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * <p>
  * CustomDraft class.

forge-gui/src/main/java/forge/gamemodes/limited/LimitedDeckEvaluator.java

@@ -17,11 +17,11 @@
  */
 package forge.gamemodes.limited;
 
+import java.util.Map.Entry;
+
 import forge.deck.Deck;
 import forge.item.PaperCard;
 
-import java.util.Map.Entry;
-
 /**
  * <p>
  * LimitedDeckEvaluator class.

forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayer.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.limited;
 
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
 //import com.google.common.collect.Lists;
 import forge.deck.CardPool;
 import forge.deck.Deck;
@@ -7,8 +11,6 @@ import forge.deck.DeckSection;
 import forge.item.PaperCard;
 //import forge.gamemodes.limited.powers.DraftPower;
 
-import java.util.*;
-
 public class LimitedPlayer {
     // A Player class for inside some type of limited environment, like Draft.
     final protected int order;

forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayerAI.java

@@ -1,5 +1,7 @@
 package forge.gamemodes.limited;
 
+import java.util.List;
+
 import forge.card.ColorSet;
 import forge.deck.CardPool;
 import forge.deck.Deck;
@@ -7,8 +9,6 @@ import forge.deck.DeckSection;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgePreferences;
 
-import java.util.List;
-
 public class LimitedPlayerAI extends LimitedPlayer {
     protected DeckColors deckCols;
 

forge-gui/src/main/java/forge/gamemodes/limited/ReadDraftRankings.java

@@ -1,12 +1,12 @@
 package forge.gamemodes.limited;
 
-import forge.localinstance.properties.ForgeConstants;
-import forge.util.FileUtil;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import forge.localinstance.properties.ForgeConstants;
+import forge.util.FileUtil;
+
 /**
  * ReadDraftRankings class.
  * 

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

@@ -17,7 +17,18 @@
  */
 package forge.gamemodes.limited;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Stack;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.collect.Lists;
+
 import forge.StaticData;
 import forge.card.CardEdition;
 import forge.card.MagicColor;
@@ -38,19 +49,10 @@ import forge.model.CardBlock;
 import forge.model.FModel;
 import forge.model.UnOpenedMeta;
 import forge.util.FileUtil;
+import forge.util.Localizer;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
-import forge.util.Localizer;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Stack;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/limited/SealedDeckBuilder.java

@@ -1,6 +1,11 @@
 package forge.gamemodes.limited;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import com.google.common.collect.Iterables;
+
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
@@ -8,10 +13,6 @@ import forge.card.MagicColor;
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Deck builder for Sealed Deck Format.
  * 

forge-gui/src/main/java/forge/gamemodes/limited/ThemedChaosDraft.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.limited;
 
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 
@@ -8,9 +12,6 @@ import forge.game.GameFormat;
 import forge.model.FModel;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFile;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.List;
 
 /**
  * Themed chaos draft allows limiting the pool of available random boosters for a draft to a certain theme.

forge-gui/src/main/java/forge/gamemodes/match/GameLobby.java

@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;

forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java

@@ -9,9 +9,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import forge.LobbyPlayer;
-import forge.interfaces.IGameController;
-import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableMap;
@@ -19,12 +16,16 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.eventbus.Subscribe;
 
+import forge.LobbyPlayer;
 import forge.game.Game;
 import forge.game.GameRules;
 import forge.game.GameType;
 import forge.game.GameView;
 import forge.game.Match;
-import forge.game.event.*;
+import forge.game.event.GameEvent;
+import forge.game.event.GameEventSubgameEnd;
+import forge.game.event.GameEventSubgameStart;
+import forge.game.event.IGameEventVisitor;
 import forge.game.player.Player;
 import forge.game.player.PlayerView;
 import forge.game.player.RegisteredPlayer;
@@ -40,6 +41,7 @@ import forge.gui.events.UiEventAttackerDeclared;
 import forge.gui.events.UiEventBlockerAssigned;
 import forge.gui.events.UiEventNextGameDecision;
 import forge.gui.interfaces.IGuiGame;
+import forge.interfaces.IGameController;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
@@ -51,6 +53,7 @@ import forge.sound.MusicPlaylist;
 import forge.sound.SoundSystem;
 import forge.trackable.TrackableCollection;
 import forge.util.CollectionSuppliers;
+import forge.util.TextUtil;
 import forge.util.collect.FCollectionView;
 import forge.util.maps.HashMapOfLists;
 import forge.util.maps.MapOfLists;

forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java

@@ -17,12 +17,19 @@
  */
 package forge.gamemodes.match.input;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import com.google.common.collect.Sets;
 
 import forge.game.GameEntity;
 import forge.game.GameEntityView;
-import forge.game.card.*;
+import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
+import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;
+import forge.game.card.CardView;
 import forge.game.combat.AttackingBand;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
@@ -34,12 +41,8 @@ import forge.game.zone.ZoneType;
 import forge.gui.events.UiEventAttackerDeclared;
 import forge.player.PlayerControllerHuman;
 import forge.util.ITriggerEvent;
-import forge.util.collect.FCollectionView;
 import forge.util.Localizer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import forge.util.collect.FCollectionView;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java

@@ -17,6 +17,8 @@
  */
 package forge.gamemodes.match.input;
 
+import java.util.List;
+
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;
@@ -31,10 +33,8 @@ import forge.gui.FThreads;
 import forge.gui.events.UiEventBlockerAssigned;
 import forge.player.PlayerControllerHuman;
 import forge.util.ITriggerEvent;
-import forge.util.ThreadUtil;
 import forge.util.Localizer;
-
-import java.util.List;
+import forge.util.ThreadUtil;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/match/input/InputConfirmMulligan.java

@@ -18,6 +18,7 @@
 package forge.gamemodes.match.input;
 
 import java.util.List;
+
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
@@ -28,8 +29,8 @@ import forge.game.zone.ZoneType;
 import forge.player.PlayerControllerHuman;
 import forge.util.ITriggerEvent;
 import forge.util.Lang;
-import forge.util.ThreadUtil;
 import forge.util.Localizer;
+import forge.util.ThreadUtil;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java

@@ -18,6 +18,7 @@
 package forge.gamemodes.match.input;
 
 import java.util.List;
+
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;

forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java

@@ -1,11 +1,12 @@
 package forge.gamemodes.match.input;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
 
-import forge.game.spellability.SpellAbilityView;
-import forge.gui.FThreads;
-import forge.gui.GuiBase;
-import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
@@ -23,11 +24,15 @@ import forge.game.player.Player;
 import forge.game.player.PlayerView;
 import forge.game.spellability.AbilityManaPart;
 import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityView;
+import forge.gui.FThreads;
+import forge.gui.GuiBase;
 import forge.player.HumanPlay;
 import forge.player.PlayerControllerHuman;
 import forge.util.Evaluator;
 import forge.util.ITriggerEvent;
 import forge.util.Localizer;
+import forge.util.TextUtil;
 
 public abstract class InputPayMana extends InputSyncronizedBase {
     private static final long serialVersionUID = 718128600948280315L;

forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectCardsForConvokeOrImprovise.java

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import forge.util.TextUtil;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
-import forge.model.FModel;
 import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
@@ -20,8 +18,10 @@ import forge.game.mana.ManaCostBeingPaid;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.localinstance.properties.ForgePreferences;
+import forge.model.FModel;
 import forge.player.PlayerControllerHuman;
 import forge.util.ITriggerEvent;
+import forge.util.TextUtil;
 
 
 public final class InputSelectCardsForConvokeOrImprovise extends InputSelectManyBase<Card> {

forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.match.input;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.card.CardView;
@@ -14,10 +18,6 @@ import forge.util.ITriggerEvent;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSelectManyBase<T> {
     private static final long serialVersionUID = -6609493252672573139L;
 

forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java

@@ -1,5 +1,12 @@
 package forge.gamemodes.match.input;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -24,13 +31,6 @@ import forge.util.Aggregates;
 import forge.util.ITriggerEvent;
 import forge.util.TextUtil;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 public final class InputSelectTargets extends InputSyncronizedBase {
     private final List<Card> choices;
     // some cards can be targeted several times (eg: distribute damage as you choose)

forge-gui/src/main/java/forge/gamemodes/net/CObjectInputStream.java

@@ -1,7 +1,5 @@
 package forge.gamemodes.net;
 
-import io.netty.handler.codec.serialization.ClassResolver;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,6 +7,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.io.StreamCorruptedException;
 
+import io.netty.handler.codec.serialization.ClassResolver;
+
 public class CObjectInputStream extends ObjectInputStream {
     private final ClassResolver classResolver;
 

forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectDecoder.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.net;
 
+import java.io.ObjectInputStream;
+import java.io.StreamCorruptedException;
+
+import forge.gui.GuiBase;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.channel.ChannelHandlerContext;
@@ -7,11 +11,6 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.codec.serialization.ClassResolver;
 import net.jpountz.lz4.LZ4BlockInputStream;
 
-import java.io.ObjectInputStream;
-import java.io.StreamCorruptedException;
-
-import forge.gui.GuiBase;
-
 public class CompatibleObjectDecoder extends LengthFieldBasedFrameDecoder {
     private final ClassResolver classResolver;
 

forge-gui/src/main/java/forge/gamemodes/net/CompatibleObjectEncoder.java

@@ -1,15 +1,14 @@
 package forge.gamemodes.net;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufOutputStream;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
-import net.jpountz.lz4.LZ4BlockOutputStream;
-
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 import forge.gui.GuiBase;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import net.jpountz.lz4.LZ4BlockOutputStream;
 
 public class CompatibleObjectEncoder extends MessageToByteEncoder<Serializable> {
     private static final byte[] LENGTH_PLACEHOLDER = new byte[4];

forge-gui/src/main/java/forge/gamemodes/net/GameProtocolHandler.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.net;
 
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import forge.gamemodes.net.event.GuiGameEvent;
 import forge.gamemodes.net.event.ReplyEvent;
 import forge.gui.FThreads;
@@ -8,10 +12,6 @@ import forge.localinstance.assets.FSkinProp;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public abstract class GameProtocolHandler<T> extends ChannelInboundHandlerAdapter {
 
     private final boolean runInEdt;

forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java

@@ -2,8 +2,8 @@ package forge.gamemodes.net;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.gamemodes.match.LobbySlotType;
 import forge.gamemodes.match.GameLobby.GameLobbyData;
+import forge.gamemodes.match.LobbySlotType;
 import forge.gamemodes.net.client.ClientGameLobby;
 import forge.gamemodes.net.client.FGameClient;
 import forge.gamemodes.net.event.IdentifiableNetEvent;
@@ -20,8 +20,8 @@ import forge.interfaces.ILobbyListener;
 import forge.interfaces.IPlayerChangeListener;
 import forge.interfaces.IUpdateable;
 import forge.localinstance.properties.ForgeConstants;
-import forge.localinstance.properties.ForgeProfileProperties;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.properties.ForgeProfileProperties;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;

forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java

@@ -1,5 +1,10 @@
 package forge.gamemodes.net;
 
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.base.Function;
 
 import forge.deck.CardPool;
@@ -20,11 +25,6 @@ import forge.trackable.TrackableCollection;
 import forge.util.ITriggerEvent;
 import forge.util.ReflectionUtil;
 
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 /**
  * The methods that can be sent through this protocol.
  */

forge-gui/src/main/java/forge/gamemodes/net/client/FGameClient.java

@@ -1,18 +1,5 @@
 package forge.gamemodes.net.client;
 
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.serialization.ClassResolvers;
-
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
@@ -28,6 +15,18 @@ import forge.gamemodes.net.event.MessageEvent;
 import forge.gamemodes.net.event.NetEvent;
 import forge.gui.interfaces.IGuiGame;
 import forge.interfaces.ILobbyListener;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.serialization.ClassResolvers;
 
 public class FGameClient implements IToServer {
 

forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java

@@ -1,8 +1,20 @@
 package forge.gamemodes.net.client;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.List;
+
 import com.google.common.collect.Lists;
+
 import forge.LobbyPlayer;
-import forge.game.*;
+import forge.game.Game;
+import forge.game.GameRules;
+import forge.game.GameType;
+import forge.game.GameView;
+import forge.game.Match;
+import forge.game.player.PlayerView;
 import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.match.LobbySlot;
 import forge.gamemodes.net.GameProtocolHandler;
@@ -13,18 +25,15 @@ import forge.gamemodes.net.event.LoginEvent;
 import forge.gui.interfaces.IGuiGame;
 import forge.interfaces.ILobbyListener;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.model.FModel;
 import forge.player.LobbyPlayerHuman;
 import forge.player.PlayerZoneUpdate;
 import forge.player.PlayerZoneUpdates;
+import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableObject;
 import forge.trackable.TrackableTypes;
 import forge.trackable.Tracker;
 import io.netty.channel.ChannelHandlerContext;
-import forge.game.player.PlayerView;
-import forge.model.FModel;
-import forge.trackable.TrackableCollection;
-
-import java.util.*;
 
 final class GameClientHandler extends GameProtocolHandler<IGuiGame> {
     private final FGameClient client;

forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java

@@ -1,5 +1,30 @@
 package forge.gamemodes.net.server;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.DatagramSocket;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+
+import org.fourthline.cling.UpnpService;
+import org.fourthline.cling.UpnpServiceImpl;
+import org.fourthline.cling.support.igd.PortMappingListener;
+import org.fourthline.cling.support.model.PortMapping;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+
 import forge.gamemodes.match.LobbySlot;
 import forge.gamemodes.match.LobbySlotType;
 import forge.gamemodes.net.CompatibleObjectDecoder;
@@ -29,24 +54,6 @@ import io.netty.handler.codec.serialization.ClassResolvers;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.*;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-
-import org.fourthline.cling.UpnpService;
-import org.fourthline.cling.UpnpServiceImpl;
-import org.fourthline.cling.support.igd.PortMappingListener;
-import org.fourthline.cling.support.model.PortMapping;
-
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
 public final class FServerManager {
     private static FServerManager instance = null;
 

forge-gui/src/main/java/forge/gamemodes/net/server/GameServerHandler.java

@@ -1,11 +1,11 @@
 package forge.gamemodes.net.server;
 
-import io.netty.channel.ChannelHandlerContext;
 import forge.gamemodes.net.GameProtocolHandler;
 import forge.gamemodes.net.IRemote;
 import forge.gamemodes.net.ProtocolMethod;
 import forge.gamemodes.net.ReplyPool;
 import forge.interfaces.IGameController;
+import io.netty.channel.ChannelHandlerContext;
 
 final class GameServerHandler extends GameProtocolHandler<IGameController> {
 

forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java

@@ -1,6 +1,11 @@
 package forge.gamemodes.net.server;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.base.Function;
+
 import forge.LobbyPlayer;
 import forge.deck.CardPool;
 import forge.game.GameEntityView;
@@ -22,10 +27,6 @@ import forge.player.PlayerZoneUpdates;
 import forge.trackable.TrackableCollection;
 import forge.util.ITriggerEvent;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 public class NetGuiGame extends AbstractGuiGame {
 
     private final GameProtocolSender sender;

forge-gui/src/main/java/forge/gamemodes/net/server/RemoteClient.java

@@ -1,12 +1,11 @@
 package forge.gamemodes.net.server;
 
-import io.netty.channel.Channel;
-
 import java.util.concurrent.TimeoutException;
 
 import forge.gamemodes.net.ReplyPool;
 import forge.gamemodes.net.event.IdentifiableNetEvent;
 import forge.gamemodes.net.event.NetEvent;
+import io.netty.channel.Channel;
 
 public final class RemoteClient implements IToClient {
 

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestAwardPool.java

@@ -2,6 +2,7 @@ package forge.gamemodes.planarconquest;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import forge.item.PaperCard;
 
 public class ConquestAwardPool {

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java

@@ -17,6 +17,16 @@
  */
 package forge.gamemodes.planarconquest;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import com.google.common.base.Function;
 
 import forge.card.CardDb;
@@ -31,15 +41,11 @@ import forge.localinstance.achievements.PlaneswalkerAchievements;
 import forge.localinstance.assets.ISkinImage;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
+import forge.util.CardTranslation;
 import forge.util.FileUtil;
+import forge.util.Localizer;
 import forge.util.XmlReader;
 import forge.util.XmlWriter;
-import forge.util.Localizer;
-import forge.util.CardTranslation;
-
-import java.io.File;
-import java.util.*;
-import java.util.Map.Entry;
 
 public final class ConquestData {
     private static final String XML_FILE = "data.xml";

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestDeckMap.java

@@ -17,11 +17,11 @@
  */
 package forge.gamemodes.planarconquest;
 
+import java.util.Map;
+
 import forge.deck.Deck;
 import forge.util.storage.StorageBase;
 
-import java.util.Map;
-
 public class ConquestDeckMap extends StorageBase<Deck> {
     public ConquestDeckMap(Map<String, Deck> in) {
         super("Conquest decks", null, in);

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestLocation.java

@@ -2,6 +2,7 @@ package forge.gamemodes.planarconquest;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import forge.model.FModel;
 import forge.util.XmlReader;
 import forge.util.XmlWriter;

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java

@@ -1,5 +1,11 @@
 package forge.gamemodes.planarconquest;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -10,18 +16,22 @@ import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.card.CardRules;
 import forge.card.CardType;
+import forge.card.CardType.CoreType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
-import forge.card.CardType.CoreType;
 import forge.card.mana.ManaCostShard;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckFormat;
 import forge.deck.DeckSection;
-import forge.deck.generation.*;
+import forge.deck.generation.DeckGenerator2Color;
+import forge.deck.generation.DeckGenerator3Color;
+import forge.deck.generation.DeckGenerator5Color;
+import forge.deck.generation.DeckGeneratorBase;
+import forge.deck.generation.DeckGeneratorMonoColor;
+import forge.deck.generation.IDeckGenPool;
 import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
 import forge.gamemodes.quest.QuestUtil;
-import forge.gui.card.*;
 import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
@@ -32,12 +42,6 @@ import forge.util.FileUtil;
 import forge.util.Localizer;
 import forge.util.MyRandom;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 public class ConquestUtil {
     private ConquestUtil() {}
 

forge-gui/src/main/java/forge/gamemodes/puzzle/Puzzle.java

@@ -1,6 +1,12 @@
 package forge.gamemodes.puzzle;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.Sets;
+
 import forge.ai.GameState;
 import forge.game.Game;
 import forge.game.GameType;
@@ -16,11 +22,6 @@ import forge.item.InventoryItem;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
 public class Puzzle extends GameState implements InventoryItem, Comparable<Puzzle> {
     String name;
     String filename;

forge-gui/src/main/java/forge/gamemodes/puzzle/PuzzleIO.java

@@ -1,16 +1,16 @@
 package forge.gamemodes.puzzle;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.Lists;
 
 import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileSection;
 import forge.util.FileUtil;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 public class PuzzleIO {
 
     public static final String TXF_PROMPT = "[New Puzzle]";

forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java

@@ -17,6 +17,15 @@
  */
 package forge.gamemodes.quest;
 
+import static forge.gamemodes.quest.QuestUtilCards.isLegalInQuestFormat;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
@@ -29,18 +38,16 @@ import forge.card.MagicColor;
 import forge.card.PrintSheet;
 import forge.game.GameFormat;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
-import forge.gui.card.*;
-import forge.item.*;
+import forge.item.BoosterPack;
+import forge.item.IPaperCard;
 import forge.item.IPaperCard.Predicates.Presets;
+import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import forge.item.TournamentPack;
 import forge.model.FModel;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 import forge.util.PredicateString.StringOp;
-import org.apache.commons.lang3.StringUtils;
-
-import static forge.gamemodes.quest.QuestUtilCards.isLegalInQuestFormat;
-
-import java.util.*;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/quest/IQuestRewardCard.java

@@ -1,10 +1,10 @@
 package forge.gamemodes.quest;
 
+import java.util.List;
+
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
 
-import java.util.List;
-
 /** 
  * Various card rewards that may be awarded during the Quest.
  * Classes that implement this interface should be able to build

forge-gui/src/main/java/forge/gamemodes/quest/QuestChallengeGenerator.java

@@ -1,6 +1,14 @@
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.base.Predicate;
+
 import forge.deck.DeckgenUtil;
 import forge.game.GameFormat;
 import forge.item.PaperCard;
@@ -8,8 +16,6 @@ import forge.model.FModel;
 import forge.util.MyRandom;
 import forge.util.storage.IStorage;
 
-import java.util.*;
-
 public class QuestChallengeGenerator {
 
     private GameFormat formatMedium=FModel.getFormats().getModern();

forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java

@@ -43,9 +43,9 @@ import forge.gamemodes.quest.data.GameFormatQuest;
 import forge.gamemodes.quest.data.QuestAchievements;
 import forge.gamemodes.quest.data.QuestAssets;
 import forge.gamemodes.quest.data.QuestData;
-import forge.gamemodes.quest.data.StarRating;
 import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
+import forge.gamemodes.quest.data.StarRating;
 import forge.gamemodes.quest.io.QuestChallengeReader;
 import forge.item.PreconDeck;
 import forge.localinstance.properties.ForgeConstants;

forge-gui/src/main/java/forge/gamemodes/quest/QuestDeckMap.java

@@ -17,11 +17,11 @@
  */
 package forge.gamemodes.quest;
 
+import java.util.Map;
+
 import forge.deck.Deck;
 import forge.util.storage.StorageBase;
 
-import java.util.Map;
-
 /**
  * TODO: Write javadoc for this type.
  * 

forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java

@@ -1,5 +1,9 @@
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import com.google.common.collect.Lists;
 
 import forge.deck.Deck;
@@ -24,10 +28,6 @@ import forge.player.GamePlayerUtil;
 import forge.util.MyRandom;
 import forge.util.storage.IStorage;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 public class QuestDraftUtils {
     public static boolean TOURNAMENT_TOGGLE = false;
     public static boolean AI_BACKGROUND = false;

forge-gui/src/main/java/forge/gamemodes/quest/QuestEvent.java

@@ -17,15 +17,15 @@
  */
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import com.google.common.base.Function;
 
 import forge.deck.Deck;
 import forge.item.InventoryItem;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * <p>
  * QuestEvent.

forge-gui/src/main/java/forge/gamemodes/quest/QuestEventChallenge.java

@@ -17,12 +17,13 @@
  */
 package forge.gamemodes.quest;
 
-import com.google.common.base.Function;
-import forge.deck.Deck;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.base.Function;
+
+import forge.deck.Deck;
+
 /**
  * <p>
  * QuestQuest class.

forge-gui/src/main/java/forge/gamemodes/quest/QuestEventCommanderDuelManager.java

@@ -1,15 +1,19 @@
 package forge.gamemodes.quest;
 
-import forge.deck.*;
-import forge.gamemodes.quest.data.QuestPreferences;
-import forge.item.PaperCard;
-import forge.model.FModel;
-import forge.util.MyRandom;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import forge.deck.CardPool;
+import forge.deck.CommanderDeckGenerator;
+import forge.deck.Deck;
+import forge.deck.DeckFormat;
+import forge.deck.DeckProxy;
+import forge.gamemodes.quest.data.QuestPreferences;
+import forge.item.PaperCard;
+import forge.model.FModel;
+import forge.util.MyRandom;
+
 /**
  * Manages the creation of random Commander duels for a Commander variant quest. Random generation is handled via
  * the CommanderDeckGenerator class.

forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java

@@ -17,6 +17,17 @@
  */
 package forge.gamemodes.quest;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import forge.card.CardEdition;
 import forge.card.CardEdition.CardInSet;
 import forge.card.CardRarity;
@@ -41,9 +52,6 @@ import forge.util.NameGenerator;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 /**
  * <p>
  * QuestEvent.

forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDuelManager.java

@@ -17,6 +17,12 @@
  */
 package forge.gamemodes.quest;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import forge.gamemodes.quest.data.QuestPreferences;
 import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
@@ -29,9 +35,6 @@ import forge.util.maps.MapOfLists;
 import forge.util.storage.IStorage;
 import forge.util.storage.StorageBase;
 
-import java.io.File;
-import java.util.*;
-
 /**
  * QuestEventManager.
  *

forge-gui/src/main/java/forge/gamemodes/quest/QuestEventLDADuelManager.java

@@ -17,6 +17,11 @@
  */
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import forge.deck.CardArchetypeLDAGenerator;
 import forge.deck.io.Archetype;
 import forge.game.GameFormat;
@@ -28,10 +33,6 @@ import forge.util.CollectionSuppliers;
 import forge.util.MyRandom;
 import forge.util.maps.EnumMapOfLists;
 import forge.util.maps.MapOfLists;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * QuestEventManager.

forge-gui/src/main/java/forge/gamemodes/quest/QuestRewardCardFiltered.java

@@ -1,15 +1,15 @@
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 import forge.item.PaperCard;
 import forge.model.FModel;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /** 
  * Allows the player to choose a card from a predicate-filtered list of cards.
  *

forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java

@@ -1,5 +1,13 @@
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.base.Function;
 
 import forge.deck.CardPool;
@@ -10,21 +18,22 @@ import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gamemodes.quest.io.ReadPriceList;
 import forge.gui.GuiBase;
 import forge.gui.util.SOptionPane;
-import forge.item.*;
+import forge.item.BoosterBox;
+import forge.item.BoosterPack;
+import forge.item.BoxedProduct;
+import forge.item.FatPack;
+import forge.item.IPaperCard;
+import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import forge.item.PreconDeck;
+import forge.item.SealedProduct;
+import forge.item.TournamentPack;
 import forge.itemmanager.IItemManager;
 import forge.itemmanager.SItemManagerUtil;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 import forge.util.ItemPool;
 
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 public class QuestSpellShop {
     private static Map<String, Integer> mapPrices;
     private static double multiplier;

forge-gui/src/main/java/forge/gamemodes/quest/QuestTournamentController.java

@@ -25,10 +25,10 @@ import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
+import forge.util.Localizer;
 import forge.util.TextUtil;
 import forge.util.ThreadUtil;
 import forge.util.storage.IStorage;
-import forge.util.Localizer;
 
 public class QuestTournamentController {
     private final IQuestTournamentView view;

forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java

@@ -17,6 +17,13 @@
  */
 package forge.gamemodes.quest;
 
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+
 import com.google.common.collect.ImmutableMap;
 
 import forge.LobbyPlayer;
@@ -48,13 +55,6 @@ import forge.model.FModel;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
-
 /**
  * <p>
  * QuestUtil class.

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

@@ -17,6 +17,14 @@
  */
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+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;
@@ -37,9 +45,16 @@ import forge.gamemodes.quest.data.QuestAssets;
 import forge.gamemodes.quest.data.QuestPreferences;
 import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
-import forge.gui.card.*;
-import forge.item.*;
+import forge.item.BoosterBox;
+import forge.item.BoosterPack;
+import forge.item.FatPack;
+import forge.item.IPaperCard;
+import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import forge.item.PreconDeck;
+import forge.item.SealedProduct;
 import forge.item.SealedProduct.Template;
+import forge.item.TournamentPack;
 import forge.item.generation.BoosterSlots;
 import forge.item.generation.UnOpenedProduct;
 import forge.localinstance.properties.ForgePreferences.FPref;
@@ -47,13 +62,6 @@ import forge.model.FModel;
 import forge.util.Aggregates;
 import forge.util.ItemPool;
 import forge.util.MyRandom;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
 
 /**
  * This is a helper class to execute operations on QuestData. It has been

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

@@ -24,7 +24,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
-import forge.util.TextUtil;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import com.google.common.collect.ImmutableList;
@@ -41,6 +40,7 @@ import forge.item.PaperCard;
 import forge.item.SealedProduct;
 import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
+import forge.util.TextUtil;
 import forge.util.storage.IStorage;
 
 /** 

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

@@ -1,13 +1,26 @@
 package forge.gamemodes.quest;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.collect.ImmutableList;
+
 import forge.LobbyPlayer;
 import forge.card.CardEdition;
 import forge.game.GameEndReason;
 import forge.game.GameFormat;
 import forge.game.GameOutcome;
 import forge.game.GameView;
-import forge.game.player.*;
+import forge.game.player.GameLossReason;
+import forge.game.player.PlayerOutcome;
+import forge.game.player.PlayerStatistics;
+import forge.game.player.PlayerView;
+import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.quest.bazaar.QuestItemType;
 import forge.gamemodes.quest.data.QuestPreferences;
 import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs;
@@ -15,8 +28,12 @@ import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gui.interfaces.IButton;
 import forge.gui.interfaces.IWinLoseView;
 import forge.gui.util.SGuiChoose;
-import forge.item.*;
+import forge.item.BoosterPack;
 import forge.item.IPaperCard.Predicates;
+import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import forge.item.SealedProduct;
+import forge.item.TournamentPack;
 import forge.item.generation.BoosterSlots;
 import forge.item.generation.IUnOpenedProduct;
 import forge.item.generation.UnOpenedProduct;
@@ -28,14 +45,6 @@ import forge.util.Localizer;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
-
 public class QuestWinLoseController {
     private final GameView lastGame;
     private final IWinLoseView<? extends IButton> view;

forge-gui/src/main/java/forge/gamemodes/quest/QuestWorld.java

@@ -17,14 +17,6 @@
  */
 package forge.gamemodes.quest;
 
-import com.google.common.base.Function;
-import forge.deck.Deck;
-import forge.game.GameFormat;
-import forge.gamemodes.quest.data.GameFormatQuest;
-import forge.item.PaperCard;
-import forge.model.FModel;
-import forge.util.storage.StorageReaderFile;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,6 +24,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.base.Function;
+
+import forge.deck.Deck;
+import forge.game.GameFormat;
+import forge.gamemodes.quest.data.GameFormatQuest;
+import forge.item.PaperCard;
+import forge.model.FModel;
+import forge.util.storage.StorageReaderFile;
+
 /** 
  * This function holds the "world info" for the current quest.
  *

forge-gui/src/main/java/forge/gamemodes/quest/SellRules.java

@@ -17,11 +17,11 @@
  */
 package forge.gamemodes.quest;
 
+import java.util.List;
+
 import forge.gamemodes.quest.data.QuestAchievements;
 import forge.util.FileSection;
 
-import java.util.List;
-
 /** 
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestBazaarManager.java

@@ -32,9 +32,6 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.thoughtworks.xstream.security.NoTypePermission;
-import com.thoughtworks.xstream.security.NullPermission;
-import com.thoughtworks.xstream.security.PrimitiveTypePermission;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -43,6 +40,9 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.NullPermission;
+import com.thoughtworks.xstream.security.PrimitiveTypePermission;
 
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.data.QuestAssets;

forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetStats.java

@@ -1,16 +1,17 @@
 package forge.gamemodes.quest.bazaar;
 
+import java.io.File;
+import java.util.List;
+
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.item.PaperToken;
 import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
 
-import java.io.File;
-import java.util.List;
-
 /** 
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/gamemodes/quest/bazaar/QuestPetStorage.java

@@ -1,5 +1,22 @@
 package forge.gamemodes.quest.bazaar;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.security.NoTypePermission;
 import com.thoughtworks.xstream.security.NullPermission;
@@ -8,21 +25,6 @@ import com.thoughtworks.xstream.security.PrimitiveTypePermission;
 import forge.gamemodes.quest.data.QuestAssets;
 import forge.util.IgnoringXStream;
 import forge.util.XmlUtil;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/gamemodes/quest/data/GameFormatQuest.java

@@ -17,15 +17,15 @@
  */
 package forge.gamemodes.quest.data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.model.FModel;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * This is an alternate game format type, the main difference is that this

forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAchievements.java

@@ -1,16 +1,16 @@
 package forge.gamemodes.quest.data;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import forge.gamemodes.quest.QuestEventDraft;
 import forge.gamemodes.quest.QuestEventDraft.QuestDraftFormat;
 import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.model.FModel;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
  * TODO: Write javadoc for this type.
  *

forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAssets.java

@@ -18,7 +18,6 @@
 package forge.gamemodes.quest.data;
 
 import java.lang.reflect.InvocationTargetException;
-
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;

forge-gui/src/main/java/forge/gamemodes/quest/data/QuestData.java

@@ -17,17 +17,17 @@
  */
 package forge.gamemodes.quest.data;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
 import forge.game.GameFormat;
 import forge.gamemodes.quest.QuestMode;
 import forge.gamemodes.quest.io.QuestDataIO;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
 //when you create QuestDataOld and AFTER you copy the AI decks over
 //you have to call one of these two methods below
 //see Gui_QuestOptions for more details

forge-gui/src/main/java/forge/gamemodes/quest/data/QuestPreferences.java

@@ -17,13 +17,13 @@
  */
 package forge.gamemodes.quest.data;
 
+import java.io.Serializable;
+
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.PreferencesStore;
 import forge.util.Localizer;
 import forge.util.TextUtil;
 
-import java.io.Serializable;
-
 @SuppressWarnings("serial")
 public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> implements Serializable {
 

forge-gui/src/main/java/forge/gamemodes/quest/io/QuestChallengeReader.java

@@ -1,5 +1,11 @@
 package forge.gamemodes.quest.io;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 import forge.ImageKeys;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
@@ -10,12 +16,6 @@ import forge.util.FileUtil;
 import forge.util.TextUtil;
 import forge.util.storage.StorageReaderFolder;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 public class QuestChallengeReader extends StorageReaderFolder<QuestEventChallenge> {
     public QuestChallengeReader(File deckDir0) {
         super(deckDir0, QuestEventChallenge.FN_GET_ID);

forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDataIO.java

@@ -17,15 +17,46 @@
  */
 package forge.gamemodes.quest.io;
 
-import com.thoughtworks.xstream.security.NoTypePermission;
-import com.thoughtworks.xstream.security.NullPermission;
-import com.thoughtworks.xstream.security.PrimitiveTypePermission;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.NullPermission;
+import com.thoughtworks.xstream.security.PrimitiveTypePermission;
+
 import forge.card.CardEdition;
 import forge.deck.CardPool;
 import forge.deck.Deck;
@@ -35,29 +66,29 @@ import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestEventDraft;
 import forge.gamemodes.quest.QuestMode;
 import forge.gamemodes.quest.bazaar.QuestItemType;
-import forge.gamemodes.quest.data.*;
+import forge.gamemodes.quest.data.DeckConstructionRules;
+import forge.gamemodes.quest.data.GameFormatQuest;
+import forge.gamemodes.quest.data.QuestAchievements;
+import forge.gamemodes.quest.data.QuestAssets;
+import forge.gamemodes.quest.data.QuestData;
+import forge.gamemodes.quest.data.QuestEventDraftContainer;
+import forge.gamemodes.quest.data.QuestItemCondition;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
-import forge.item.*;
+import forge.gamemodes.quest.data.StarRating;
+import forge.item.BoosterBox;
+import forge.item.BoosterPack;
+import forge.item.FatPack;
+import forge.item.InventoryItem;
+import forge.item.PaperCard;
+import forge.item.PreconDeck;
+import forge.item.SealedProduct;
+import forge.item.TournamentPack;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
 import forge.util.FileUtil;
 import forge.util.IgnoringXStream;
 import forge.util.ItemPool;
 import forge.util.XmlUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.*;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 
 /**
  * <p>

forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDuelReader.java

@@ -1,5 +1,10 @@
 package forge.gamemodes.quest.io;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.List;
+import java.util.Map;
+
 import forge.ImageKeys;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
@@ -10,11 +15,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 QuestDuelReader extends StorageReaderFolder<QuestEventDuel> {
     public QuestDuelReader(File deckDir0) {
         super(deckDir0, QuestEvent.FN_GET_NAME);

forge-gui/src/main/java/forge/gamemodes/quest/io/ReadPriceList.java

@@ -17,15 +17,15 @@
  */
 package forge.gamemodes.quest.io;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import forge.card.MagicColor;
 import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.MyRandom;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * ReadPriceList class.

forge-gui/src/main/java/forge/gamemodes/tournament/TournamentData.java

@@ -1,5 +1,12 @@
 package forge.gamemodes.tournament;
 
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
 
 import forge.deck.Deck;
@@ -9,13 +16,6 @@ import forge.gamemodes.match.HostedMatch;
 import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgeConstants;
 
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 public class TournamentData {
     @XStreamOmitField
     private String name; // set based on the the filename on load

forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java

@@ -1,5 +1,18 @@
 package forge.gamemodes.tournament;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
@@ -9,17 +22,12 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.security.NoTypePermission;
 import com.thoughtworks.xstream.security.NullPermission;
 import com.thoughtworks.xstream.security.PrimitiveTypePermission;
+
 import forge.deck.CardPool;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
 import forge.util.IgnoringXStream;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.*;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 
 public class TournamentIO {
     /** Prompt in text field for new (unsaved) built gauntlets. */