Organize imports

src/magic/CardTest.java

@@ -1,6 +1,5 @@
 package magic;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -11,6 +10,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import magic.ai.MagicAI;
 import magic.ai.MagicAIImpl;
 import magic.data.CardDefinitions;

src/magic/CommandLineArgs.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
+
 import magic.ai.MagicAI;
 import magic.ai.MagicAIImpl;
 import magic.data.DuelConfig;

src/magic/DeckStrCal.java

@@ -1,6 +1,7 @@
 package magic;
 
 import java.io.File;
+
 import magic.ai.MagicAIImpl;
 import magic.data.DeckGenerators;
 import magic.data.DuelConfig;

src/magic/HeadlessAIGame.java

@@ -1,6 +1,7 @@
 package magic;
 
 import java.util.Collections;
+
 import magic.ai.MagicAI;
 import magic.data.DuelConfig;
 import magic.data.GeneralConfig;

src/magic/MagicMain.java

@@ -8,7 +8,11 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.SwingUtilities;
+
+import org.pushingpixels.trident.TridentConfig;
+
 import magic.ai.MagicAI;
 import magic.data.DeckGenerators;
 import magic.data.DuelConfig;
@@ -30,7 +34,6 @@ import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
 import magic.utility.MagicSystem;
 import magic.utility.ProgressReporter;
-import org.pushingpixels.trident.TridentConfig;
 
 public class MagicMain {
 

src/magic/ai/ArtificialScoringSystem.java

@@ -1,5 +1,7 @@
 package magic.ai;
 
+import java.util.Set;
+
 import magic.model.MagicAbility;
 import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
@@ -9,8 +11,6 @@ import magic.model.MagicPermanent;
 import magic.model.MagicPowerToughness;
 import magic.model.choice.MagicCombatCreature;
 
-import java.util.Set;
-
 public class ArtificialScoringSystem {
 
     public static final int WIN_GAME_SCORE=100000000;

src/magic/ai/MCTSAI.java

@@ -11,6 +11,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
+
 import magic.data.LRUCache;
 import magic.exception.GameException;
 import magic.model.MagicGame;

src/magic/ai/MMAB.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+
 import magic.model.MagicGame;
 import magic.model.MagicGameLog;
 import magic.model.MagicPlayer;

src/magic/ai/MTDF.java

@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import magic.model.MagicGame;
 import magic.model.MagicGameLog;
 import magic.model.MagicPlayer;

src/magic/ai/VegasAI.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+
 import magic.model.MagicGame;
 import magic.model.MagicGameLog;
 import magic.model.MagicPlayer;

src/magic/awt/MagicFont.java

@@ -6,6 +6,7 @@ import java.awt.font.TextAttribute;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+
 import magic.utility.MagicResources;
 
 public enum MagicFont {

src/magic/cardBuilder/ResourceManager.java

@@ -4,6 +4,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
+
 import javax.imageio.ImageIO;
 
 import magic.data.LRUCache;

src/magic/cardBuilder/renderers/CardBuilder.java

@@ -4,10 +4,10 @@ import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 
+import magic.model.IRenderableCard;
 import magic.model.MagicAbility;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
-import magic.model.IRenderableCard;
 
 public class CardBuilder {
 

src/magic/cardBuilder/renderers/Frame.java

@@ -9,18 +9,18 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 
+import magic.cardBuilder.CardResource;
+import magic.cardBuilder.ResourceManager;
+import magic.model.IRenderableCard;
 import magic.model.MagicColor;
 import magic.model.MagicManaType;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
 import magic.model.event.MagicManaActivation;
-import magic.model.IRenderableCard;
-import magic.cardBuilder.ResourceManager;
-import magic.cardBuilder.CardResource;
 
 public class Frame {
 

src/magic/cardBuilder/renderers/ImageFrame.java

@@ -7,13 +7,13 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import magic.cardBuilder.CardResource;
+import magic.cardBuilder.ResourceManager;
+import magic.model.IRenderableCard;
 import magic.model.MagicColor;
 import magic.model.MagicType;
 import magic.ui.ImageFileIO;
 import magic.ui.MagicImages;
-import magic.model.IRenderableCard;
-import magic.cardBuilder.ResourceManager;
-import magic.cardBuilder.CardResource;
 import magic.ui.helpers.ImageHelper;
 import magic.utility.MagicFileSystem;
 

src/magic/cardBuilder/renderers/OracleText.java

@@ -23,6 +23,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
+
 import magic.awt.MagicFont;
 import magic.cardBuilder.CardResource;
 import magic.cardBuilder.ResourceManager;

src/magic/cardBuilder/renderers/Overlay.java

@@ -8,8 +8,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import magic.cardBuilder.ResourceManager;
 import magic.cardBuilder.CardResource;
+import magic.cardBuilder.ResourceManager;
 import magic.model.IRenderableCard;
 import magic.model.MagicAbility;
 import magic.model.MagicColor;

src/magic/cardBuilder/renderers/PTFrame.java

@@ -11,15 +11,15 @@ import java.awt.font.TextLayout;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
-import magic.awt.MagicFont;
 
+import magic.awt.MagicFont;
+import magic.cardBuilder.CardResource;
+import magic.cardBuilder.ResourceManager;
+import magic.model.IRenderableCard;
 import magic.model.MagicAbility;
 import magic.model.MagicColor;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
-import magic.model.IRenderableCard;
-import magic.cardBuilder.ResourceManager;
-import magic.cardBuilder.CardResource;
 
 public class PTFrame {
 

src/magic/cardBuilder/renderers/TitleFrame.java

@@ -14,13 +14,14 @@ import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
 import java.text.AttributedString;
 import java.util.List;
-import javax.swing.ImageIcon;
-import magic.awt.MagicFont;
 
+import javax.swing.ImageIcon;
+
+import magic.awt.MagicFont;
 import magic.data.MagicIcon;
+import magic.model.IRenderableCard;
 import magic.model.MagicType;
 import magic.ui.MagicImages;
-import magic.model.IRenderableCard;
 
 public class TitleFrame {
 

src/magic/cardBuilder/renderers/TypeLine.java

@@ -7,12 +7,12 @@ import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
-import magic.awt.MagicFont;
 
-import magic.model.MagicType;
+import magic.awt.MagicFont;
-import magic.model.IRenderableCard;
-import magic.cardBuilder.ResourceManager;
 import magic.cardBuilder.CardResource;
+import magic.cardBuilder.ResourceManager;
+import magic.model.IRenderableCard;
+import magic.model.MagicType;
 
 public class TypeLine {
     private static final Font cardTypeFont = MagicFont.JaceBelerenBold.get().deriveFont(Font.PLAIN, 16);

src/magic/data/CardDefinitions.java

@@ -1,7 +1,7 @@
 package magic.data;
 
-import groovy.lang.GroovyShell;
+import static java.nio.charset.StandardCharsets.UTF_8;
-import groovy.transform.CompileStatic;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -27,6 +27,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer;
+import org.codehaus.groovy.control.customizers.ImportCustomizer;
+
+import groovy.lang.GroovyShell;
+import groovy.transform.CompileStatic;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicChangeCardDefinition;
 import magic.model.MagicColor;
@@ -37,10 +44,6 @@ import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
 import magic.utility.MagicSystem;
 import magic.utility.ProgressReporter;
-import org.codehaus.groovy.control.CompilerConfiguration;
-import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer;
-import org.codehaus.groovy.control.customizers.ImportCustomizer;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class CardDefinitions {
 

src/magic/data/CardImageFile.java

@@ -2,6 +2,7 @@ package magic.data;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import magic.model.IRenderableCard;
 import magic.model.MagicCardDefinition;
 import magic.utility.MagicFileSystem;

src/magic/data/CardStatistics.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+
 import magic.model.MagicCardDefinition;
 import magic.model.MagicColor;
 import magic.model.MagicManaCost;

src/magic/data/DeckGenerator.java

@@ -1,6 +1,7 @@
 package magic.data;
 
 import java.util.Collection;
+
 import magic.generator.RandomDeckGenerator;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicColor;

src/magic/data/DeckGenerators.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Set;
 import java.util.TreeMap;
+
 import magic.generator.RandomDeckGenerator;
 import magic.model.DuelPlayerConfig;
 import magic.model.MagicDeck;

src/magic/data/DeckType.java

@@ -3,6 +3,7 @@ package magic.data;
 import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.Set;
+
 import magic.translate.MText;
 import magic.utility.DeckUtils;
 

src/magic/data/DownloadableFile.java

@@ -10,6 +10,7 @@ import java.net.Proxy;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+
 import org.apache.commons.io.FileUtils;
 
 public class DownloadableFile {

src/magic/data/DuelConfig.java

@@ -2,6 +2,7 @@ package magic.data;
 
 import java.io.File;
 import java.util.Properties;
+
 import magic.model.DuelPlayerConfig;
 import magic.model.MagicDeckProfile;
 import magic.model.MagicDuel;

src/magic/data/GeneralConfig.java

@@ -10,6 +10,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
+
 import magic.data.settings.BooleanSetting;
 import magic.data.settings.IntegerSetting;
 import magic.data.settings.StringSetting;

src/magic/data/ImagesDownloadList.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import magic.model.MagicCardDefinition;
 
 @SuppressWarnings("serial")

src/magic/data/MagicCustomFormat.java

@@ -1,19 +1,19 @@
 package magic.data;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
+import magic.model.MagicCardDefinition;
 import magic.utility.FileIO;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
-import magic.model.MagicCardDefinition;
 
 public class MagicCustomFormat extends MagicFormat {
 

src/magic/data/MagicFormat.java

@@ -1,8 +1,9 @@
 package magic.data;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Collectors;
+
 import magic.model.MagicCardDefinition;
 import magic.model.MagicDeck;
 import magic.translate.MText;

src/magic/data/MagicPredefinedFormat.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
+
 import magic.model.MagicCardDefinition;
 import magic.model.MagicDeck;
 import magic.utility.DeckUtils;

src/magic/data/MagicSetDefinitions.java

@@ -2,13 +2,13 @@ package magic.data;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.awt.Desktop;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Scanner;
+
 import magic.model.MagicCardDefinition;
 import magic.model.MagicSetDefinition;
 import magic.ui.helpers.DesktopHelper;

src/magic/data/UnimplementedParser.java

@@ -4,14 +4,15 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.UnsupportedEncodingException;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+
 import magic.model.MagicCardDefinition;
 import magic.utility.FileIO;
 import magic.utility.MagicFileSystem;

src/magic/data/json/DownloadableJsonFile.java

@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import magic.data.DownloadableFile;
 
 public class DownloadableJsonFile extends DownloadableFile {

src/magic/data/json/NewVersionJsonParser.java

@@ -2,10 +2,12 @@ package magic.data.json;
 
 import java.io.File;
 import java.io.IOException;
+
+import org.json.JSONObject;
+
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
 import magic.utility.MagicSystem;
-import org.json.JSONObject;
 
 public final class NewVersionJsonParser {
     private NewVersionJsonParser() {}

src/magic/data/settings/IntegerSetting.java

@@ -1,6 +1,7 @@
 package magic.data.settings;
 
 import java.awt.Color;
+
 import magic.ui.MagicStickyFrame;
 
 public enum IntegerSetting {

src/magic/data/stats/MagicStats.java

@@ -3,6 +3,9 @@ package magic.data.stats;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.h2.api.ErrorCode;
+
 import magic.data.DeckType;
 import magic.data.DuelConfig;
 import magic.data.GeneralConfig;
@@ -13,7 +16,6 @@ import magic.model.MagicGame;
 import magic.ui.ScreenController;
 import magic.utility.DeckUtils;
 import magic.utility.MagicSystem;
-import org.h2.api.ErrorCode;
 
 public final class MagicStats {
     private MagicStats() {}

src/magic/data/stats/h2/H2Database.java

@@ -11,6 +11,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+
+import org.h2.jdbcx.JdbcConnectionPool;
+
 import magic.data.stats.DeckStatsInfo;
 import magic.data.stats.GameStatsInfo;
 import magic.model.MagicDeck;
@@ -21,7 +24,6 @@ import magic.model.player.PlayerProfile;
 import magic.utility.DeckUtils;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicSystem;
-import org.h2.jdbcx.JdbcConnectionPool;
 
 public class H2Database {
 

src/magic/data/stats/h2/H2Schema.java

@@ -4,9 +4,11 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import magic.utility.MagicResources;
+
 import org.h2.tools.RunScript;
 
+import magic.utility.MagicResources;
+
 enum H2Schema {
 
     /**

src/magic/exception/handler/ExceptionReport.java

@@ -2,8 +2,11 @@ package magic.exception.handler;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+
+import magic.exception.GameException;
 import magic.model.MagicCard;
 import magic.model.MagicGame;
+import magic.model.MagicLogger;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 import magic.model.MagicPlayer;
@@ -11,8 +14,6 @@ import magic.model.MagicPowerToughness;
 import magic.model.action.MagicAction;
 import magic.model.stack.MagicItemOnStack;
 import magic.utility.MagicSystem;
-import magic.exception.GameException;
-import magic.model.MagicLogger;
 
 
 public class ExceptionReport {

src/magic/exception/handler/FileExceptionHandler.java

@@ -2,6 +2,7 @@ package magic.exception.handler;
 
 import java.io.IOException;
 import java.nio.file.Path;
+
 import magic.utility.FileIO;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;

src/magic/firemind/FiremindClient.java

@@ -22,15 +22,17 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import magic.data.CardDefinitions;
+
-import magic.data.GeneralConfig;
-import magic.utility.MagicFileSystem;
-import magic.utility.MagicFileSystem.DataPath;
 import org.apache.commons.io.FileUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import magic.data.CardDefinitions;
+import magic.data.GeneralConfig;
+import magic.utility.MagicFileSystem;
+import magic.utility.MagicFileSystem.DataPath;
+
 public class FiremindClient {
 
     protected static final GeneralConfig CONFIG = GeneralConfig.getInstance();

src/magic/firemind/FiremindDuelRunner.java

@@ -1,5 +1,7 @@
 package magic.firemind;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
@@ -10,6 +12,7 @@ import java.nio.file.Files;
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import magic.ai.MagicAIImpl;
 import magic.data.CardDefinitions;
 import magic.data.DuelConfig;
@@ -25,7 +28,6 @@ import magic.model.MagicRandom;
 import magic.model.player.AiProfile;
 import magic.utility.DeckUtils;
 import magic.utility.MagicSystem;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class FiremindDuelRunner {
     private static int games;

src/magic/firemind/FiremindGameReport.java

@@ -1,23 +1,23 @@
 package magic.firemind;
 
-import magic.utility.FileIO;
-import magic.model.action.MagicAction;
-import magic.model.stack.MagicItemOnStack;
-import magic.utility.MagicFileSystem;
-import magic.utility.MagicFileSystem.DataPath;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import magic.model.MagicCard;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 import magic.model.MagicPlayer;
 import magic.model.MagicPowerToughness;
+import magic.model.action.MagicAction;
+import magic.model.stack.MagicItemOnStack;
+import magic.utility.FileIO;
+import magic.utility.MagicFileSystem;
+import magic.utility.MagicFileSystem.DataPath;
 import magic.utility.MagicSystem;
 
 public class FiremindGameReport implements Thread.UncaughtExceptionHandler {

src/magic/firemind/FiremindJsonReader.java

@@ -6,12 +6,14 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+
 import magic.data.json.DownloadableJsonFile;
 import magic.model.MagicDeck;
 import magic.utility.DeckUtils;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
-import org.apache.commons.io.FileUtils;
 
 public final class FiremindJsonReader {
     private FiremindJsonReader() {}

src/magic/firemind/JsonOrgParser.java

@@ -5,12 +5,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import magic.utility.DeckUtils;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import magic.data.json.DownloadableJsonFile;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicDeck;
-import org.json.JSONArray;
+import magic.utility.DeckUtils;
-import org.json.JSONObject;
 
 public final class JsonOrgParser {
     private JsonOrgParser() {}

src/magic/game/state/GameLoader.java

@@ -2,6 +2,7 @@ package magic.game.state;
 
 import java.io.File;
 import java.util.List;
+
 import magic.ai.MagicAIImpl;
 import magic.model.DuelPlayerConfig;
 import magic.model.MagicDeckProfile;

src/magic/game/state/GamePlayerState.java

@@ -2,6 +2,7 @@ package magic.game.state;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import magic.model.DuelPlayerConfig;
 
 public class GamePlayerState {

src/magic/game/state/GameStateFileReader.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+
 import magic.utility.FileIO;
 
 public final class GameStateFileReader {

src/magic/game/state/GameStateFileWriter.java

@@ -5,6 +5,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
+
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicSystem;
 import magic.utility.SortedProperties;

src/magic/game/state/GameStateSnapshot.java

@@ -3,13 +3,14 @@ package magic.game.state;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import magic.model.DuelPlayerConfig;
 import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicDuel;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.MagicPlayer;
-import magic.model.DuelPlayerConfig;
 
 public final class GameStateSnapshot {
     private GameStateSnapshot() {}

src/magic/generator/Ability_Mono_DeckGenerator.java

@@ -1,5 +1,8 @@
 package magic.generator;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import magic.data.CardDefinitions;
 import magic.model.MagicAbility;
 import magic.model.MagicCardDefinition;
@@ -7,9 +10,6 @@ import magic.model.MagicColor;
 import magic.model.MagicDeckProfile;
 import magic.model.MagicRandom;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 public class Ability_Mono_DeckGenerator extends RandomDeckGenerator {
 
     private static final int MIN_NUM_CARDS_WITH_SUBTYPE = 30;

src/magic/generator/Tribal_Mono_DeckGenerator.java

@@ -1,14 +1,14 @@
 package magic.generator;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import magic.data.CardDefinitions;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicColor;
 import magic.model.MagicDeckProfile;
-import magic.model.MagicSubType;
 import magic.model.MagicRandom;
-
+import magic.model.MagicSubType;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 public class Tribal_Mono_DeckGenerator extends RandomDeckGenerator {
 

src/magic/headless/HeadlessGameController.java

@@ -1,10 +1,10 @@
 package magic.headless;
 
 import magic.ai.MagicAI;
+import magic.model.IGameController;
 import magic.model.MagicGame;
 import magic.model.MagicPlayer;
 import magic.model.event.MagicEvent;
-import magic.model.IGameController;
 
 public class HeadlessGameController implements IGameController {
 

src/magic/model/ARG.java

@@ -4,15 +4,16 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
+
 import magic.data.EnglishToInt;
 import magic.data.RomanToInt;
 import magic.model.action.MagicPlayMod;
 import magic.model.event.MagicEvent;
 import magic.model.stack.MagicItemOnStack;
 import magic.model.target.MagicTarget;
-import magic.model.target.MagicTargetHint;
 import magic.model.target.MagicTargetFilter;
 import magic.model.target.MagicTargetFilterFactory;
+import magic.model.target.MagicTargetHint;
 
 public class ARG {
     public static final String COLON = "\\s*:\\s*";

src/magic/model/DuelPlayerConfig.java

@@ -3,6 +3,7 @@ package magic.model;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import magic.data.DeckType;
 import magic.model.player.PlayerProfile;
 import magic.utility.DeckParser;

src/magic/model/IRenderableCard.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import magic.model.event.MagicManaActivation;
 
 public interface IRenderableCard {

src/magic/model/IUIGameController.java

@@ -2,6 +2,7 @@ package magic.model;
 
 import java.util.List;
 import java.util.Set;
+
 import magic.exception.UndoClickedException;
 import magic.model.choice.MagicPlayChoiceResult;
 

src/magic/model/MagicAbility.java

@@ -11,12 +11,131 @@ import magic.exception.ScriptParseException;
 import magic.model.condition.MagicCondition;
 import magic.model.condition.MagicConditionFactory;
 import magic.model.condition.MagicConditionParser;
-import magic.model.event.*;
+import magic.model.event.MagicAdditionalCost;
+import magic.model.event.MagicBestowActivation;
+import magic.model.event.MagicCardAbilityActivation;
+import magic.model.event.MagicCrewActivation;
+import magic.model.event.MagicCyclingActivation;
+import magic.model.event.MagicDashActivation;
+import magic.model.event.MagicETBEvent;
+import magic.model.event.MagicEmbalmActivation;
+import magic.model.event.MagicEquipActivation;
+import magic.model.event.MagicEternalizeActivation;
+import magic.model.event.MagicEventFactory;
+import magic.model.event.MagicEvokeActivation;
+import magic.model.event.MagicFlashbackActivation;
+import magic.model.event.MagicHandCastActivation;
+import magic.model.event.MagicJumpStartActivation;
+import magic.model.event.MagicKickerCost;
+import magic.model.event.MagicLevelUpActivation;
+import magic.model.event.MagicManaActivation;
+import magic.model.event.MagicMatchedCostEvent;
+import magic.model.event.MagicMegamorphActivation;
+import magic.model.event.MagicMorphActivation;
+import magic.model.event.MagicMorphCastActivation;
+import magic.model.event.MagicMultikickerCost;
+import magic.model.event.MagicNinjutsuActivation;
+import magic.model.event.MagicOutlastActivation;
+import magic.model.event.MagicPermanentActivation;
+import magic.model.event.MagicPlaneswalkerActivation;
+import magic.model.event.MagicRegularCostEvent;
+import magic.model.event.MagicReinforceActivation;
+import magic.model.event.MagicRetraceActivation;
+import magic.model.event.MagicRuleEventAction;
+import magic.model.event.MagicSacrificeManaActivation;
+import magic.model.event.MagicSacrificeTapManaActivation;
+import magic.model.event.MagicScavengeActivation;
+import magic.model.event.MagicSourceEvent;
+import magic.model.event.MagicSpectacleActivation;
+import magic.model.event.MagicSurgeActivation;
+import magic.model.event.MagicSuspendActivation;
+import magic.model.event.MagicTransmuteActivation;
+import magic.model.event.MagicTypeCyclingActivation;
+import magic.model.event.MagicUnearthActivation;
 import magic.model.mstatic.MagicCDA;
 import magic.model.mstatic.MagicStatic;
 import magic.model.target.MagicTargetFilter;
 import magic.model.target.MagicTargetFilterFactory;
-import magic.model.trigger.*;
+import magic.model.trigger.ACounterIsPutTrigger;
+import magic.model.trigger.AnnihilatorTrigger;
+import magic.model.trigger.AtBeginOfCombatTrigger;
+import magic.model.trigger.AtDrawTrigger;
+import magic.model.trigger.AtEndOfCombatTrigger;
+import magic.model.trigger.AtEndOfTurnTrigger;
+import magic.model.trigger.AtUntapTrigger;
+import magic.model.trigger.AtUpkeepTrigger;
+import magic.model.trigger.AtYourUpkeepTrigger;
+import magic.model.trigger.AttacksTrigger;
+import magic.model.trigger.AttacksUnblockedTrigger;
+import magic.model.trigger.BattalionTrigger;
+import magic.model.trigger.BattleCryTrigger;
+import magic.model.trigger.BecomesBlockedPumpTrigger;
+import magic.model.trigger.BecomesBlockedTrigger;
+import magic.model.trigger.BecomesStateTrigger;
+import magic.model.trigger.BecomesTappedTrigger;
+import magic.model.trigger.BecomesTargetTrigger;
+import magic.model.trigger.BecomesUntappedTrigger;
+import magic.model.trigger.BlocksPumpTrigger;
+import magic.model.trigger.BlocksTrigger;
+import magic.model.trigger.BloodthirstTrigger;
+import magic.model.trigger.CantBeBlockedTrigger;
+import magic.model.trigger.CantBlockTrigger;
+import magic.model.trigger.CardIsDiscardedTrigger;
+import magic.model.trigger.CascadeTrigger;
+import magic.model.trigger.ChampionTrigger;
+import magic.model.trigger.CumulativeUpkeepTrigger;
+import magic.model.trigger.DamageIsDealtTrigger;
+import magic.model.trigger.DethroneTrigger;
+import magic.model.trigger.DevourTrigger;
+import magic.model.trigger.EchoTrigger;
+import magic.model.trigger.EntersBattlefieldTrigger;
+import magic.model.trigger.EntersTappedTrigger;
+import magic.model.trigger.EntersWithCounterTrigger;
+import magic.model.trigger.ExaltedTrigger;
+import magic.model.trigger.ExtortTrigger;
+import magic.model.trigger.FadeVanishCounterTrigger;
+import magic.model.trigger.FlankingTrigger;
+import magic.model.trigger.FromGraveyardIntoLibraryTrigger;
+import magic.model.trigger.HeroicTrigger;
+import magic.model.trigger.LeavesBattlefieldTrigger;
+import magic.model.trigger.LeavesReturnExiledTrigger;
+import magic.model.trigger.LifeIsGainedTrigger;
+import magic.model.trigger.LivingWeaponTrigger;
+import magic.model.trigger.MadnessTrigger;
+import magic.model.trigger.MiracleTrigger;
+import magic.model.trigger.ModularTrigger;
+import magic.model.trigger.OneOrMoreCountersArePutTrigger;
+import magic.model.trigger.OtherCycleTrigger;
+import magic.model.trigger.OtherDiesTrigger;
+import magic.model.trigger.OtherDrawnTrigger;
+import magic.model.trigger.OtherEntersBattlefieldTrigger;
+import magic.model.trigger.OtherSpellIsCastTrigger;
+import magic.model.trigger.PersistTrigger;
+import magic.model.trigger.PreventDamageTrigger;
+import magic.model.trigger.ProtectionTrigger;
+import magic.model.trigger.ProwessTrigger;
+import magic.model.trigger.RampageTrigger;
+import magic.model.trigger.SacrificeTrigger;
+import magic.model.trigger.SagaChapterTrigger;
+import magic.model.trigger.SoulshiftTrigger;
+import magic.model.trigger.StormTrigger;
+import magic.model.trigger.ThisAttacksTrigger;
+import magic.model.trigger.ThisBecomesBlockedByTrigger;
+import magic.model.trigger.ThisBecomesBlockedTrigger;
+import magic.model.trigger.ThisBecomesTargetTrigger;
+import magic.model.trigger.ThisBlocksTrigger;
+import magic.model.trigger.ThisCombatDamagePlayerTrigger;
+import magic.model.trigger.ThisCycleTrigger;
+import magic.model.trigger.ThisDiesTrigger;
+import magic.model.trigger.ThisPutIntoGraveyardTrigger;
+import magic.model.trigger.ThisSpellIsCastTrigger;
+import magic.model.trigger.TributeTrigger;
+import magic.model.trigger.TurnedFaceUpTrigger;
+import magic.model.trigger.UndyingTrigger;
+import magic.model.trigger.UnleashTrigger;
+import magic.model.trigger.WhenTransformsTrigger;
+import magic.model.trigger.YouScryTrigger;
+import magic.model.trigger.YouSurveilTrigger;
 
 public enum MagicAbility {
 

src/magic/model/MagicAbilityList.java

@@ -1,17 +1,17 @@
 package magic.model;
 
-import magic.model.event.MagicActivation;
-import magic.model.event.MagicManaActivation;
-import magic.model.event.MagicPermanentActivation;
-import magic.model.trigger.MagicTrigger;
-import magic.model.mstatic.MagicStatic;
-import magic.model.action.AddTriggerAction;
-import magic.model.action.AddStaticAction;
-
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import magic.model.action.AddStaticAction;
+import magic.model.action.AddTriggerAction;
+import magic.model.event.MagicActivation;
+import magic.model.event.MagicManaActivation;
+import magic.model.event.MagicPermanentActivation;
+import magic.model.mstatic.MagicStatic;
+import magic.model.trigger.MagicTrigger;
+
 public class MagicAbilityList implements MagicAbilityStore {
 
     private List<MagicAbility> abilities = new LinkedList<>();

src/magic/model/MagicCardDefinition.java

@@ -1,14 +1,34 @@
 package magic.model;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 import magic.ai.ArtificialScoringSystem;
 import magic.data.CardDefinitions;
 import magic.data.CardProperty;
-import magic.model.event.*;
+import magic.model.condition.MagicCondition;
+import magic.model.event.MagicActivation;
+import magic.model.event.MagicActivationHints;
+import magic.model.event.MagicAdditionalCost;
+import magic.model.event.MagicCardEvent;
+import magic.model.event.MagicEvent;
+import magic.model.event.MagicEventSource;
+import magic.model.event.MagicHandCastActivation;
+import magic.model.event.MagicManaActivation;
+import magic.model.event.MagicPayManaCostEvent;
+import magic.model.event.MagicPermanentActivation;
+import magic.model.event.MagicPlayCardEvent;
+import magic.model.event.MagicTiming;
 import magic.model.mstatic.MagicCDA;
 import magic.model.mstatic.MagicStatic;
-import magic.model.condition.MagicCondition;
 import magic.model.trigger.AtBeginOfFirstMainPhaseTrigger;
 import magic.model.trigger.EntersBattlefieldTrigger;
 import magic.model.trigger.EntersWithCounterTrigger;

src/magic/model/MagicColor.java

@@ -1,10 +1,11 @@
 package magic.model;
 
-import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
+
 import magic.translate.MText;
 
 public enum MagicColor {

src/magic/model/MagicDeck.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import magic.data.DeckType;
 import magic.utility.DeckUtils;
 

src/magic/model/MagicDuel.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Properties;
+
 import magic.data.DeckGenerators;
 import magic.data.DuelConfig;
 import magic.data.stats.MagicStats;

src/magic/model/MagicGame.java

@@ -8,6 +8,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
 import magic.data.GeneralConfig;
 import magic.data.settings.BooleanSetting;
 import magic.exception.GameException;
@@ -46,6 +47,7 @@ import magic.model.target.MagicTargetFilterFactory;
 import magic.model.target.MagicTargetHint;
 import magic.model.target.MagicTargetNone;
 import magic.model.trigger.AtEndOfTurnTrigger;
+import magic.model.trigger.AtUpkeepTrigger;
 import magic.model.trigger.DamageIsDealtTrigger;
 import magic.model.trigger.MagicPermanentTrigger;
 import magic.model.trigger.MagicPermanentTriggerMap;
@@ -53,7 +55,6 @@ import magic.model.trigger.MagicTrigger;
 import magic.model.trigger.MagicTriggerType;
 import magic.model.trigger.OtherEntersBattlefieldTrigger;
 import magic.model.trigger.PreventDamageTrigger;
-import magic.model.trigger.AtUpkeepTrigger;
 import magic.ui.MagicSound;
 
 public class MagicGame {

src/magic/model/MagicGameLog.java

@@ -1,11 +1,13 @@
 package magic.model;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class MagicGameLog {
     private MagicGameLog() {}

src/magic/model/MagicLogBook.java

@@ -3,6 +3,7 @@ package magic.model;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
+
 import magic.utility.MagicSystem;
 
 public class MagicLogBook {

src/magic/model/MagicLogMessageBuilder.java

@@ -1,7 +1,7 @@
 package magic.model;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class MagicLogMessageBuilder {
 

src/magic/model/MagicLogger.java

@@ -1,14 +1,16 @@
 package magic.model;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicSystem;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class MagicLogger {
 

src/magic/model/MagicMessage.java

@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import magic.model.choice.MagicCardChoiceResult;
 import magic.model.phase.MagicPhaseType;
 import magic.model.stack.MagicCardOnStack;

src/magic/model/MagicPermanent.java

@@ -1,5 +1,6 @@
 package magic.model;
 
+import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -9,7 +10,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Set;
 
 import magic.ai.ArtificialScoringSystem;

src/magic/model/MagicPermanentList.java

@@ -1,8 +1,8 @@
 package magic.model;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 @SuppressWarnings("serial")
 public class MagicPermanentList extends ArrayList<MagicPermanent> implements MagicCopyable {

src/magic/model/MagicRarity.java

@@ -1,6 +1,7 @@
 package magic.model;
 
 import java.util.EnumSet;
+
 import magic.translate.MText;
 
 public enum MagicRarity {

src/magic/model/MagicSetDefinition.java

@@ -1,7 +1,7 @@
 package magic.model;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 public class MagicSetDefinition {
 

src/magic/model/MagicSource.java

@@ -1,6 +1,7 @@
 package magic.model;
 
 import java.util.Collection;
+
 import magic.model.event.MagicSourceActivation;
 
 public interface MagicSource extends MagicObject {

src/magic/model/MagicTuple.java

@@ -1,11 +1,11 @@
 package magic.model;
 
-import magic.model.stack.MagicItemOnStack;
-import magic.model.event.MagicChainEventFactory;
-import magic.model.action.MagicPermanentAction;
-
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+
+import magic.model.action.MagicPermanentAction;
+import magic.model.event.MagicChainEventFactory;
+import magic.model.stack.MagicItemOnStack;
 
 public class MagicTuple implements MagicCopyable {
 

src/magic/model/MagicType.java

@@ -5,6 +5,7 @@ import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import magic.translate.MText;
 
 public enum MagicType {

src/magic/model/action/AIRevealAction.java

@@ -1,11 +1,12 @@
 package magic.model.action;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import magic.model.MagicCard;
 import magic.model.MagicGame;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Arrays;
 
 public class AIRevealAction extends MagicAction {
 

src/magic/model/action/AbstractMillAction.java

@@ -1,5 +1,7 @@
 package magic.model.action;
 
+import java.util.List;
+
 import magic.ai.ArtificialScoringSystem;
 import magic.model.MagicCard;
 import magic.model.MagicGame;
@@ -7,8 +9,6 @@ import magic.model.MagicLocationType;
 import magic.model.MagicMessage;
 import magic.model.MagicPlayer;
 
-import java.util.List;
-
 /**
  * Ancestor of various library-milling actions
  */

src/magic/model/action/AttachAction.java

@@ -1,14 +1,14 @@
 package magic.model.action;
 
+import java.util.Collection;
+import java.util.Collections;
+
 import magic.ai.ArtificialScoringSystem;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.choice.MagicTargetChoice;
 import magic.model.mstatic.MagicPermanentStatic;
 
-import java.util.Collection;
-import java.util.Collections;
-
 /**
  * Unattaches attachable from currently attached creature.
  * Attaches attachable to new creature when not MagicPermanent.NONE.

src/magic/model/action/BecomesAction.java

@@ -2,6 +2,7 @@ package magic.model.action;
 
 import java.util.Collections;
 import java.util.Set;
+
 import magic.model.MagicAbilityList;
 import magic.model.MagicColor;
 import magic.model.MagicGame;

src/magic/model/action/ChangeCountersAction.java

@@ -3,8 +3,8 @@ package magic.model.action;
 import magic.model.MagicCounterType;
 import magic.model.MagicGame;
 import magic.model.MagicObject;
-import magic.model.MagicPlayer;
 import magic.model.MagicPermanent;
+import magic.model.MagicPlayer;
 import magic.model.trigger.MagicCounterChangeTriggerData;
 import magic.model.trigger.MagicTriggerType;
 

src/magic/model/action/ChangeStateAction.java

@@ -1,9 +1,9 @@
 package magic.model.action;
 
 import magic.model.MagicGame;
-import magic.model.MagicPlayer;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
+import magic.model.MagicPlayer;
 import magic.model.trigger.MagicTriggerType;
 
 public class ChangeStateAction extends MagicAction {

src/magic/model/action/CleanupTurnStaticsAction.java

@@ -1,10 +1,10 @@
 package magic.model.action;
 
+import java.util.Collection;
+
 import magic.model.MagicGame;
 import magic.model.mstatic.MagicPermanentStatic;
 
-import java.util.Collection;
-
 public class CleanupTurnStaticsAction extends MagicAction {
 
     private Collection<MagicPermanentStatic> removedStatics;

src/magic/model/action/CleanupTurnTriggersAction.java

@@ -1,10 +1,10 @@
 package magic.model.action;
 
+import java.util.List;
+
 import magic.model.MagicGame;
 import magic.model.trigger.MagicPermanentTrigger;
 
-import java.util.List;
-
 public class CleanupTurnTriggersAction extends MagicAction {
 
     private List<MagicPermanentTrigger> removedTriggers;

src/magic/model/action/CombatDamageAction.java

@@ -1,5 +1,8 @@
 package magic.model.action;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import magic.model.MagicAbility;
 import magic.model.MagicDamage;
 import magic.model.MagicGame;
@@ -8,9 +11,6 @@ import magic.model.MagicPermanentList;
 import magic.model.MagicPermanentState;
 import magic.model.MagicPlayer;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 /**
  * Simplification of the rules:
  * - the first blocker gets all remaining damage when the attacker does not have trample.

src/magic/model/action/DestroyAction.java

@@ -1,15 +1,15 @@
 package magic.model.action;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import magic.model.MagicAbility;
 import magic.model.MagicGame;
 import magic.model.MagicLocationType;
+import magic.model.MagicMessage;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import magic.model.MagicMessage;
-
 public class DestroyAction extends MagicAction {
 
     private final Collection<MagicPermanent> targets = new ArrayList<>();

src/magic/model/action/DetainAction.java

@@ -1,5 +1,7 @@
 package magic.model.action;
 
+import java.util.Set;
+
 import magic.model.MagicAbility;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
@@ -9,8 +11,6 @@ import magic.model.mstatic.MagicLayer;
 import magic.model.mstatic.MagicStatic;
 import magic.model.trigger.AtUpkeepTrigger;
 
-import java.util.Set;
-
 public class DetainAction extends MagicAction {
 
     private final MagicPermanent targetPermanent;

src/magic/model/action/DrawAction.java

@@ -1,5 +1,8 @@
 package magic.model.action;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import magic.ai.ArtificialScoringSystem;
 import magic.model.MagicCard;
 import magic.model.MagicCardList;
@@ -9,9 +12,6 @@ import magic.model.MagicPlayer;
 import magic.model.trigger.MagicTrigger;
 import magic.model.trigger.MagicTriggerType;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DrawAction extends MagicAction {
 
     private final MagicPlayer player;

src/magic/model/action/EnterAsCopyAction.java

@@ -3,6 +3,7 @@ package magic.model.action;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+
 import magic.model.MagicGame;
 import magic.model.MagicLocationType;
 import magic.model.MagicObject;

src/magic/model/action/FlipAction.java

@@ -1,13 +1,13 @@
 package magic.model.action;
 
+import java.util.Collection;
+import java.util.Collections;
+
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 import magic.model.mstatic.MagicStatic;
 
-import java.util.Collections;
-import java.util.Collection;
-
 public class FlipAction extends MagicAction {
 
     public final MagicPermanent permanent;

src/magic/model/action/GainAbilityAction.java

@@ -1,5 +1,9 @@
 package magic.model.action;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import magic.model.MagicAbility;
 import magic.model.MagicAbilityList;
 import magic.model.MagicGame;
@@ -8,10 +12,6 @@ import magic.model.MurmurHash3;
 import magic.model.mstatic.MagicLayer;
 import magic.model.mstatic.MagicStatic;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
 // Set an ability until end of turn.
 public class GainAbilityAction extends MagicAction {
 

src/magic/model/action/GoadAction.java

@@ -1,5 +1,7 @@
 package magic.model.action;
 
+import java.util.Set;
+
 import magic.model.MagicAbility;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
@@ -9,8 +11,6 @@ import magic.model.mstatic.MagicLayer;
 import magic.model.mstatic.MagicStatic;
 import magic.model.trigger.AtUpkeepTrigger;
 
-import java.util.Set;
-
 public class GoadAction extends MagicAction {
 
     private final MagicPermanent targetPermanent;

src/magic/model/action/LookAction.java

@@ -1,17 +1,17 @@
 package magic.model.action;
 
-import magic.model.MagicCard;
-import magic.model.MagicGame;
-import magic.model.MagicSource;
-import magic.model.MagicPlayer;
-import magic.model.choice.MagicFromCardListChoice;
-import magic.model.event.MagicEvent;
-import magic.model.event.MagicEventAction;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import magic.model.MagicCard;
+import magic.model.MagicGame;
+import magic.model.MagicPlayer;
+import magic.model.MagicSource;
+import magic.model.choice.MagicFromCardListChoice;
+import magic.model.event.MagicEvent;
+import magic.model.event.MagicEventAction;
+
 public class LookAction extends MagicAction {
 
     private final List<MagicCard> cards = new ArrayList<>();

src/magic/model/action/LoseAbilityAction.java

@@ -1,5 +1,9 @@
 package magic.model.action;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import magic.model.MagicAbility;
 import magic.model.MagicAbilityList;
 import magic.model.MagicGame;
@@ -7,10 +11,6 @@ import magic.model.MagicPermanent;
 import magic.model.mstatic.MagicLayer;
 import magic.model.mstatic.MagicStatic;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
 // Set an ability until end of turn.
 public class LoseAbilityAction extends MagicAction {
 

src/magic/model/action/MagicPermanentAction.java

@@ -1,7 +1,7 @@
 package magic.model.action;
 
-import magic.model.MagicPermanent;
 import magic.model.MagicCopyable;
+import magic.model.MagicPermanent;
 
 @FunctionalInterface
 public interface MagicPermanentAction extends MagicCopyable {

src/magic/model/action/MagicPlayMod.java

@@ -4,6 +4,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import magic.model.ARG;
 import magic.model.MagicAbility;
 import magic.model.MagicAbilityList;
 import magic.model.MagicCounterType;
@@ -11,7 +12,6 @@ import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 import magic.model.MagicPlayer;
-import magic.model.ARG;
 import magic.model.condition.MagicConditionFactory;
 import magic.model.event.MagicMorphActivation;
 import magic.model.mstatic.MagicStatic;

src/magic/model/action/ManifestCardAction.java

@@ -3,8 +3,8 @@ package magic.model.action;
 
 import magic.model.MagicCard;
 import magic.model.MagicGame;
-import magic.model.MagicPlayer;
 import magic.model.MagicPayedCost;
+import magic.model.MagicPlayer;
 import magic.model.event.MagicPlayCardEvent;
 import magic.model.stack.MagicCardOnStack;