Guava migration - Optimize imports

forge-ai/src/main/java/forge/ai/AiCardMemory.java

@@ -18,12 +18,12 @@
 
 package forge.ai;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import forge.game.card.Card;
 import forge.game.player.Player;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * <p>
  * AiCardMemory class.

forge-ai/src/main/java/forge/ai/AiProfileUtil.java

@@ -17,19 +17,18 @@
  */
 package forge.ai;
 
+import forge.LobbyPlayer;
+import forge.util.Aggregates;
+import forge.util.FileUtil;
+import forge.util.TextUtil;
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.ArrayUtils;
-
-import forge.LobbyPlayer;
-import forge.util.Aggregates;
-import forge.util.FileUtil;
-import forge.util.TextUtil;
-
 /**
  * Holds default AI personality profile values in an enum.
  * Loads profile from the given text file when setProfile is called.

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -17,15 +17,7 @@
  */
 package forge.ai;
 
-import java.util.*;
-import java.util.function.Predicate;
-
 import com.google.common.collect.*;
-import forge.game.card.*;
-import forge.game.cost.*;
-import forge.util.*;
-import org.apache.commons.lang3.StringUtils;
-
 import forge.ai.AiCardMemory.MemorySet;
 import forge.ai.ability.ProtectAi;
 import forge.ai.ability.TokenAi;
@@ -34,19 +26,15 @@ import forge.card.CardType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.mana.ManaAtom;
-import forge.game.CardTraitPredicates;
+import forge.game.*;
-import forge.game.Game;
-import forge.game.GameActionUtil;
-import forge.game.GameEntity;
-import forge.game.GameEntityCounterTable;
-import forge.game.GameObject;
-import forge.game.GameType;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.ability.effects.CharmEffect;
+import forge.game.card.*;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
+import forge.game.cost.*;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -65,7 +53,15 @@ import forge.game.trigger.TriggerType;
 import forge.game.trigger.WrappedAbility;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
+import forge.util.Aggregates;
+import forge.util.MyRandom;
+import forge.util.StreamUtil;
+import forge.util.TextUtil;
 import forge.util.collect.FCollection;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.function.Predicate;
 
 
 /**

forge-ai/src/main/java/forge/ai/SpellApiToAi.java

@@ -1,14 +1,13 @@
 package forge.ai;
 
-import java.util.Map;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-
 import forge.ai.ability.*;
 import forge.game.ability.ApiType;
 import forge.util.ReflectionUtil;
 
+import java.util.Map;
+
 public enum SpellApiToAi {
     Converter;
 

forge-ai/src/main/java/forge/ai/ability/ActivateAbilityAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
@@ -13,6 +10,9 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 public class ActivateAbilityAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/AddTurnAi.java

@@ -17,16 +17,15 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.player.Player;
 import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
 
 /**
  * <p>

forge-ai/src/main/java/forge/ai/ability/AlterAttributeAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
@@ -13,6 +10,9 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.List;
+import java.util.Map;
+
 public class AlterAttributeAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/AlwaysPlayAi.java

@@ -1,13 +1,13 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class AlwaysPlayAi extends SpellAbilityAi {
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/ability/AmassAi.java

@@ -1,20 +1,13 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
 import forge.game.card.token.TokenInfo;
 import forge.game.phase.PhaseHandler;
 import forge.game.player.Player;
@@ -22,6 +15,8 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class AmassAi extends SpellAbilityAi {
     @Override
     protected boolean checkApiLogic(Player ai, final SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/AssignGroupAi.java

@@ -1,13 +1,13 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.List;
+import java.util.Map;
+
 public class AssignGroupAi extends SpellAbilityAi {
 
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/AttachAi.java

@@ -1,30 +1,14 @@
 package forge.ai.ability;
 
-import java.util.*;
-
-import forge.game.card.*;
-import org.apache.commons.lang3.ObjectUtils;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
+import forge.ai.*;
-import forge.ai.AiAttackController;
-import forge.ai.AiCardMemory;
-import forge.ai.AiController;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
+import forge.game.card.*;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.cost.Cost;
@@ -44,6 +28,12 @@ import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 public class AttachAi extends SpellAbilityAi {
 

forge-ai/src/main/java/forge/ai/ability/BidLifeAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
@@ -14,6 +12,8 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+
 public class BidLifeAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/BondAi.java

@@ -17,14 +17,14 @@
  */
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 /**
  * <p>
  * AbilityFactoryBond class.

forge-ai/src/main/java/forge/ai/ability/ChangeCombatantsAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Collection;
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.GameEntity;
 import forge.game.player.Player;
@@ -10,6 +7,9 @@ import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Collection;
+import java.util.Map;
+
 public class ChangeCombatantsAi extends SpellAbilityAi {
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java

@@ -1,26 +1,9 @@
 package forge.ai.ability;
 
-import java.util.Collections;
+import forge.ai.*;
-import java.util.Map;
-
-import forge.ai.AiController;
-import forge.ai.AiPlayerPredicates;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -31,6 +14,9 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Collections;
+import java.util.Map;
+
 public class ChangeZoneAllAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/CharmAi.java

@@ -1,16 +1,7 @@
 package forge.ai.ability;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
+import forge.ai.*;
-import forge.ai.AiController;
-import forge.ai.AiPlayDecision;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.effects.CharmEffect;
 import forge.game.card.Card;
@@ -21,6 +12,10 @@ import forge.util.Aggregates;
 import forge.util.MyRandom;
 import forge.util.collect.FCollection;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class CharmAi extends SpellAbilityAi {
     @Override
     protected boolean checkApiLogic(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java

@@ -1,22 +1,9 @@
 package forge.ai.ability;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
-import forge.ai.AiAttackController;
+import forge.ai.*;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
 import forge.game.combat.Combat;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseHandler;
@@ -28,6 +15,10 @@ import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.IterableUtil;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class ChooseCardAi extends SpellAbilityAi {
 
     /**

forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java

@@ -1,22 +1,10 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-
 import forge.StaticData;
-import forge.ai.AiAttackController;
+import forge.ai.*;
-import forge.ai.ComputerUtil;
+import forge.card.*;
-import forge.ai.ComputerUtilCard;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
-import forge.card.CardDb;
-import forge.card.CardRules;
-import forge.card.CardSplitType;
-import forge.card.CardStateName;
-import forge.card.ICardFace;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCopyService;
@@ -28,6 +16,9 @@ import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 public class ChooseCardNameAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java

@@ -1,11 +1,6 @@
 package forge.ai.ability;
 
-import forge.ai.ComputerUtil;
+import forge.ai.*;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCost;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.card.CardCollectionView;

forge-ai/src/main/java/forge/ai/ability/ChooseCompanionAi.java

@@ -1,16 +1,15 @@
 package forge.ai.ability;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class ChooseCompanionAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/ChooseGenericAi.java

@@ -4,7 +4,8 @@ import com.google.common.collect.Lists;
 import forge.ai.*;
 import forge.card.MagicColor;
 import forge.game.Game;
-import forge.game.card.*;
+import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-ai/src/main/java/forge/ai/ability/ChoosePlayerAi.java

@@ -1,11 +1,7 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
@@ -14,6 +10,9 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+
 public class ChoosePlayerAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/ChooseSourceAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtilCard;
@@ -25,6 +22,9 @@ import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 
+import java.util.List;
+import java.util.Map;
+
 public class ChooseSourceAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java

@@ -1,24 +1,11 @@
 package forge.ai.ability;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import com.google.common.collect.Iterables;
-import forge.ai.AiCardMemory;
+import forge.ai.*;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilMana;
-import forge.ai.SpellAbilityAi;
 import forge.card.CardType;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -27,6 +14,11 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public class ChooseTypeAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/ClashAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
@@ -16,6 +14,8 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class ClashAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/CloneAi.java

@@ -1,17 +1,10 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -19,6 +12,9 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+
 public class CloneAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/ControlExchangeAi.java

@@ -1,7 +1,6 @@
 package forge.ai.ability;
 
 import com.google.common.collect.Lists;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpecialCardAi;
 import forge.ai.SpellAbilityAi;

forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java

@@ -17,17 +17,9 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-
+import forge.ai.*;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
@@ -44,6 +36,9 @@ import forge.game.staticability.StaticAbilityMustTarget;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 
+import java.util.List;
+import java.util.Map;
+
 
 //AB:GainControl|ValidTgts$Creature|TgtPrompt$Select target legendary creature|LoseControl$Untap,LoseControl|SpellDescription$Gain control of target xxxxxxx
 

forge-ai/src/main/java/forge/ai/ability/ControlGainVariantAi.java

@@ -17,9 +17,6 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
@@ -30,6 +27,9 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>

forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java

@@ -1,29 +1,12 @@
 package forge.ai.ability;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
 import com.google.common.collect.Iterables;
-import forge.ai.AiPlayDecision;
+import forge.ai.*;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CardUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -32,6 +15,11 @@ import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
 public class CopyPermanentAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/CopySpellAbilityAi.java

@@ -1,15 +1,6 @@
 package forge.ai.ability;
 
-import java.util.List;
+import forge.ai.*;
-import java.util.Map;
-
-import forge.ai.AiCardMemory;
-import forge.ai.AiPlayDecision;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtilCard;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.ApiType;
 import forge.game.player.Player;
@@ -18,6 +9,9 @@ import forge.game.spellability.Spell;
 import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 public class CopySpellAbilityAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/CounterAi.java

@@ -1,23 +1,10 @@
 package forge.ai.ability;
 
-import java.util.Iterator;
+import forge.ai.*;
-
-import forge.game.ability.effects.CounterEffect;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import forge.ai.AiController;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCost;
-import forge.ai.ComputerUtilMana;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
+import forge.game.ability.effects.CounterEffect;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.cost.CostDiscard;
@@ -28,6 +15,11 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.Iterator;
 
 public class CounterAi extends SpellAbilityAi {
 

forge-ai/src/main/java/forge/ai/ability/CountersAi.java

@@ -17,22 +17,16 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 
+import java.util.List;
+
 
 /**
  * <p>

forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
@@ -19,6 +16,9 @@ import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 import forge.util.collect.FCollection;
 
+import java.util.List;
+import java.util.Map;
+
 public class CountersMoveAi extends SpellAbilityAi {
     @Override
     protected boolean checkApiLogic(final Player ai, final SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java

@@ -1,22 +1,12 @@
 package forge.ai.ability;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -24,6 +14,10 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class CountersMultiplyAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java

@@ -1,16 +1,7 @@
 package forge.ai.ability;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
+import forge.ai.*;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.GameEntity;
 import forge.game.card.*;
 import forge.game.player.Player;
@@ -18,6 +9,10 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.IterableUtil;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 public class CountersProliferateAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java

@@ -1,10 +1,6 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
@@ -21,6 +17,9 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 public class CountersPutAllAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java

@@ -17,23 +17,13 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.player.PlayerController.BinaryChoiceType;
@@ -41,6 +31,10 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
 /**
  * <p>
  * AbilityFactory_PutOrRemoveCountersAi class.

forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java

@@ -1,9 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
@@ -12,13 +8,7 @@ import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -27,6 +17,10 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
 public class CountersRemoveAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java

@@ -1,10 +1,6 @@
 package forge.ai.ability;
 
-import forge.ai.ComputerUtilCard;
+import forge.ai.*;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.ComputerUtilMana;
-import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;

forge-ai/src/main/java/forge/ai/ability/DamagePreventAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
@@ -10,11 +7,7 @@ import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.combat.Combat;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseHandler;
@@ -25,6 +18,9 @@ import forge.game.spellability.TargetChoices;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DamagePreventAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DayTimeAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -9,6 +7,8 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class DayTimeAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/DebuffAi.java

@@ -1,11 +1,6 @@
 package forge.ai.ability;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
@@ -24,6 +19,10 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class DebuffAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java

@@ -2,11 +2,7 @@ package forge.ai.ability;
 
 import forge.ai.*;
 import forge.card.MagicColor;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
 import forge.game.combat.Combat;
 import forge.game.cost.Cost;
 import forge.game.keyword.Keyword;

forge-ai/src/main/java/forge/ai/ability/DigAi.java

@@ -1,16 +1,7 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
-import forge.ai.AiAttackController;
+import forge.ai.*;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
@@ -27,6 +18,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.TextUtil;
 
+import java.util.Map;
+
 
 public class DigAi extends SpellAbilityAi {
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
@@ -14,6 +12,8 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 
 public class DigMultipleAi extends SpellAbilityAi {
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
@@ -16,6 +13,9 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 public class DigUntilAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DiscardAi.java

@@ -1,15 +1,6 @@
 package forge.ai.ability;
 
-import java.util.Collections;
+import forge.ai.*;
-import java.util.List;
-import java.util.Map;
-
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCost;
-import forge.ai.ComputerUtilMana;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.card.CardCollectionView;
@@ -25,6 +16,10 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class DiscardAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DiscoverAi.java

@@ -8,7 +8,6 @@ import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
-
 import forge.game.spellability.Spell;
 import forge.game.spellability.SpellAbility;
 

forge-ai/src/main/java/forge/ai/ability/DrainManaAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
@@ -9,6 +7,8 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
+import java.util.List;
+
 public class DrainManaAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/DrawAi.java

@@ -18,17 +18,7 @@
  */
 package forge.ai.ability;
 
-import java.util.Map;
+import forge.ai.*;
-
-import forge.ai.AiCostDecision;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCost;
-import forge.ai.ComputerUtilMana;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpecialCardAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
@@ -38,14 +28,12 @@ import forge.game.card.CounterType;
 import forge.game.cost.*;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
-import forge.game.player.GameLossReason;
+import forge.game.player.*;
-import forge.game.player.Player;
-import forge.game.player.PlayerActionConfirmMode;
-import forge.game.player.PlayerCollection;
-import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class DrawAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/EncodeAi.java

@@ -17,9 +17,6 @@
  */
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.SpellAbilityAi;
@@ -30,6 +27,9 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * AbilityFactoryBond class.

forge-ai/src/main/java/forge/ai/ability/ExploreAi.java

@@ -1,17 +1,8 @@
 package forge.ai.ability;
 
 
-import forge.ai.AiController;
+import forge.ai.*;
-import forge.ai.AiProps;
+import forge.game.card.*;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilMana;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
-import forge.game.card.Card;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;

forge-ai/src/main/java/forge/ai/ability/FlipOntoBattlefieldAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
@@ -12,6 +10,8 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class FlipOntoBattlefieldAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/FogAi.java

@@ -1,13 +1,7 @@
 package forge.ai.ability;
 
 
-import java.util.List;
+import forge.ai.*;
-
-import forge.ai.AiCardMemory;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.ApiType;
@@ -20,6 +14,8 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+
 public class FogAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/GoadAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.SpellAbilityAi;
@@ -13,6 +11,8 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+
 public class GoadAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/HauntAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
@@ -12,6 +10,8 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+
 public class HauntAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/InvestigateAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -10,6 +8,8 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class InvestigateAi extends SpellAbilityAi {
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/ability/LearnAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.PlayerControllerAi;
 import forge.ai.SpellAbilityAi;
@@ -15,6 +13,8 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class LearnAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/LegendaryRuleAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
@@ -11,6 +9,8 @@ import forge.game.card.CounterEnumType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 /** 
  * TODO: Write javadoc for this type.
  *

forge-ai/src/main/java/forge/ai/ability/LifeExchangeVariantAi.java

@@ -1,12 +1,6 @@
 package forge.ai.ability;
 
-import forge.ai.AiAttackController;
+import forge.ai.*;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.keyword.Keyword;

forge-ai/src/main/java/forge/ai/ability/LifeGainAi.java

@@ -1,11 +1,7 @@
 package forge.ai.ability;
 
 import com.google.common.collect.Iterables;
-import forge.ai.ComputerUtil;
+import forge.ai.*;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;

forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
@@ -16,6 +14,8 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.util.collect.FCollection;
 
+import java.util.List;
+
 public class LifeLoseAi extends SpellAbilityAi {
 
     /*

forge-ai/src/main/java/forge/ai/ability/ManaAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Arrays;
-import java.util.List;
-
 import forge.ai.*;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
@@ -10,12 +7,7 @@ import forge.card.mana.ManaAtom;
 import forge.card.mana.ManaCost;
 import forge.game.CardTraitPredicates;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.cost.CostPart;
 import forge.game.cost.CostRemoveCounter;
 import forge.game.keyword.Keyword;
@@ -31,6 +23,9 @@ import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.IterableUtil;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class ManaAi extends SpellAbilityAi {
 
     /*

forge-ai/src/main/java/forge/ai/ability/ManifestBaseAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
@@ -20,6 +18,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Map;
+
 /**
  * Created by friarsol on 1/23/15.
  */

forge-ai/src/main/java/forge/ai/ability/MillAi.java

@@ -1,12 +1,7 @@
 package forge.ai.ability;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpecialCardAi;
@@ -24,6 +19,10 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class MillAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
 import forge.ai.AiCardMemory;
 import forge.ai.ComputerUtilCard;
@@ -19,6 +16,9 @@ import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.List;
+import java.util.Map;
+
 public class MustBlockAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/MutateAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
@@ -14,6 +12,8 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class MutateAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java

@@ -1,19 +1,11 @@
 package forge.ai.ability;
 
-import forge.game.card.CardCopyService;
+import forge.ai.*;
-import org.apache.commons.lang3.StringUtils;
-
-import forge.ai.AiController;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.PlayerControllerAi;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
+import forge.game.card.CardCopyService;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.keyword.Keyword;
@@ -24,6 +16,7 @@ import forge.game.spellability.SpellAbility;
 import forge.game.staticability.StaticAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * AbilityFactory for Creature Spells.

forge-ai/src/main/java/forge/ai/ability/PlayAi.java

@@ -11,7 +11,10 @@ import forge.game.cost.Cost;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
-import forge.game.spellability.*;
+import forge.game.spellability.Spell;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityPredicates;
+import forge.game.spellability.SpellPermanent;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

forge-ai/src/main/java/forge/ai/ability/PowerExchangeAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
@@ -14,6 +12,8 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+
 public class PowerExchangeAi extends SpellAbilityAi {
 
 /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/ProtectAi.java

@@ -1,14 +1,6 @@
 package forge.ai.ability;
 
-import java.util.ArrayList;
+import forge.ai.*;
-import java.util.List;
-
-import forge.ai.AiAttackController;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.SpellAbilityAi;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.GameObject;
@@ -27,6 +19,9 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.util.MyRandom;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ProtectAi extends SpellAbilityAi {
     private static boolean hasProtectionFrom(final Card card, final String color) {
         final List<String> onlyColors = new ArrayList<>(MagicColor.Constant.ONLY_COLORS);

forge-ai/src/main/java/forge/ai/ability/PumpAi.java

@@ -2,7 +2,6 @@ package forge.ai.ability;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import forge.ai.*;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
@@ -20,11 +19,7 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
 
 public class PumpAi extends PumpAiBase {
 

forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java

@@ -1,22 +1,10 @@
 package forge.ai.ability;
 
-import java.util.List;
+import forge.ai.*;
-import java.util.function.Predicate;
-
-import forge.ai.AiAttackController;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.SpellAbilityAi;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CardUtil;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.keyword.Keyword;
@@ -27,6 +15,9 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.function.Predicate;
+
 public abstract class PumpAiBase extends SpellAbilityAi {
 
     public boolean containsUsefulKeyword(final Player ai, final List<String> keywords, final Card card, final SpellAbility sa, final int attack) {

forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java

@@ -1,9 +1,5 @@
 package forge.ai.ability;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
@@ -23,6 +19,10 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class PumpAllAi extends PumpAiBase {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java

@@ -1,14 +1,7 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
+import forge.ai.*;
-
-import forge.ai.AiCardMemory;
-import forge.ai.AiController;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtilMana;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
@@ -23,6 +16,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Map;
+
 public class RearrangeTopOfLibraryAi extends SpellAbilityAi {
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/ability/RegenerateAi.java

@@ -17,9 +17,6 @@
  */
 package forge.ai.ability;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
@@ -27,17 +24,16 @@ import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * AbilityFactory_Regenerate class.

forge-ai/src/main/java/forge/ai/ability/RepeatAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.*;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
@@ -14,6 +12,8 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.util.IterableUtil;
 
+import java.util.Map;
+
 public class RepeatAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpecialCardAi;
 import forge.ai.SpellAbilityAi;
@@ -14,6 +11,9 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.TextUtil;
 
+import java.util.List;
+import java.util.Map;
+
 
 public class RepeatEachAi extends SpellAbilityAi {
 

forge-ai/src/main/java/forge/ai/ability/ReplaceDamageAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
@@ -9,6 +7,8 @@ import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class ReplaceDamageAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.card.Card;
@@ -13,6 +11,8 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class RollDiceAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
@@ -20,6 +17,9 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+
 public class SacrificeAi extends SpellAbilityAi {
 
     @Override

forge-ai/src/main/java/forge/ai/ability/ScryAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.ComputerUtilMana;
 import forge.ai.SpecialCardAi;
 import forge.ai.SpellAbilityAi;
@@ -17,6 +15,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Map;
+
 public class ScryAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/SetStateAi.java

@@ -1,13 +1,9 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
 import forge.card.CardStateName;
-
 import forge.game.ability.AbilityUtils;
 import forge.game.card.*;
 import forge.game.phase.PhaseHandler;
@@ -17,6 +13,9 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.Map;
+
 public class SetStateAi extends SpellAbilityAi {
     @Override
     protected boolean checkApiLogic(final Player aiPlayer, final SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java

@@ -1,13 +1,13 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class ShuffleAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/SkipPhaseAi.java

@@ -1,13 +1,13 @@
 package forge.ai.ability;
 
-import java.util.Map;
-
 import forge.ai.AiAttackController;
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 
+import java.util.Map;
+
 public class SkipPhaseAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/SurveilAi.java

@@ -1,12 +1,6 @@
 package forge.ai.ability;
 
-import java.util.Map;
+import forge.ai.*;
-
-import forge.ai.AiCardMemory;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtilCost;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.cost.CostPayLife;
@@ -18,6 +12,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.Map;
+
 public class SurveilAi extends SpellAbilityAi {
 
     /*

forge-ai/src/main/java/forge/ai/ability/TapAiBase.java

@@ -1,13 +1,6 @@
 package forge.ai.ability;
 
-import java.util.List;
+import forge.ai.*;
-import java.util.function.Predicate;
-
-import forge.ai.AiAttackController;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
-import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
@@ -22,6 +15,9 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.List;
+import java.util.function.Predicate;
+
 public abstract class TapAiBase extends SpellAbilityAi {
 
     /**

forge-ai/src/main/java/forge/ai/ability/TapAllAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.ComputerUtilCombat;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
@@ -19,6 +17,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+
 public class TapAllAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(final Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java

@@ -3,7 +3,10 @@ package forge.ai.ability;
 import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
-import forge.game.card.*;
+import forge.game.card.Card;
+import forge.game.card.CardPredicates;
+import forge.game.card.CounterEnumType;
+import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.player.PlayerController;

forge-ai/src/main/java/forge/ai/ability/TokenAi.java

@@ -1,28 +1,12 @@
 package forge.ai.ability;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Iterables;
-import forge.ai.AiController;
+import forge.ai.*;
-import forge.ai.AiProps;
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCard;
-import forge.ai.ComputerUtilCombat;
-import forge.ai.ComputerUtilCost;
-import forge.ai.ComputerUtilMana;
-import forge.ai.PlayerControllerAi;
-import forge.ai.SpellAbilityAi;
-import forge.ai.SpellApiToAi;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.card.Card;
+import forge.game.card.*;
-import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CardUtil;
 import forge.game.card.token.TokenInfo;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
@@ -42,6 +26,9 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * AbilityFactory_Token class.

forge-ai/src/main/java/forge/ai/ability/TwoPilesAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import forge.ai.AiAttackController;
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
@@ -13,6 +11,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.collect.FCollection;
 
+import java.util.List;
+
 public class TwoPilesAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java

@@ -1,8 +1,5 @@
 package forge.ai.ability;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpellAbilityAi;
@@ -14,6 +11,9 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class UnattachAllAi extends SpellAbilityAi {
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/VoteAi.java

@@ -1,8 +1,6 @@
 package forge.ai.ability;
 
 
-import java.util.Map;
-
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
@@ -11,6 +9,8 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Map;
+
 public class VoteAi extends SpellAbilityAi {
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)

forge-ai/src/main/java/forge/ai/simulation/GameCopier.java

@@ -1,16 +1,6 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
+import com.google.common.collect.*;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Table;
-
 import forge.LobbyPlayer;
 import forge.ai.AIOption;
 import forge.ai.LobbyPlayerAi;
@@ -18,7 +8,10 @@ import forge.card.CardRarity;
 import forge.card.CardRules;
 import forge.game.*;
 import forge.game.ability.effects.DetachedCardEffect;
-import forge.game.card.*;
+import forge.game.card.Card;
+import forge.game.card.CardCloneStates;
+import forge.game.card.CardCopyService;
+import forge.game.card.CounterType;
 import forge.game.card.token.TokenInfo;
 import forge.game.combat.Combat;
 import forge.game.mana.Mana;
@@ -34,6 +27,10 @@ import forge.game.zone.PlayerZoneBattlefield;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class GameCopier {
     private static final ZoneType[] ZONES = new ZoneType[] {
         ZoneType.Battlefield,

forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java

@@ -1,12 +1,6 @@
 package forge.ai.simulation;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import forge.ai.ComputerUtil;
 import forge.ai.PlayerControllerAi;
 import forge.ai.simulation.GameStateEvaluator.Score;
@@ -19,6 +13,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetChoices;
 import forge.util.collect.FCollectionView;
 
+import java.util.*;
+
 public class GameSimulator {
     public static boolean COPY_STACK = false;
     final private SimulationController controller;

forge-ai/src/main/java/forge/ai/simulation/MultiTargetSelector.java

@@ -1,12 +1,12 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityCondition;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MultiTargetSelector {
     public static class Targets {
         private ArrayList<PossibleTargetSelector.Targets> targets;

forge-ai/src/main/java/forge/ai/simulation/Plan.java

@@ -1,15 +1,14 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.base.Joiner;
-
 import forge.ai.simulation.GameStateEvaluator.Score;
 import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.spellability.SpellAbility;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Plan {
     private final List<Decision> decisions;
     private final Score finalScore;

forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java

@@ -1,11 +1,6 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 import com.google.common.collect.ArrayListMultimap;
-
 import forge.ai.ComputerUtilCard;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
@@ -15,6 +10,10 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 public class PossibleTargetSelector {
     private final SpellAbility sa;
     private final SpellAbility targetingSa;

forge-ai/src/main/java/forge/ai/simulation/SimulationController.java

@@ -1,15 +1,15 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import forge.ai.simulation.GameStateEvaluator.Score;
 import forge.game.GameObject;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class SimulationController {
     private static boolean DEBUG = false;
     private static int MAX_DEPTH = 3;