Guava migration - Remove migration scaffold

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

@@ -17,6 +17,7 @@
  */
 package forge.ai;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.ability.AnimateAi;
 import forge.game.GameEntity;

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

@@ -18,6 +18,7 @@
 package forge.ai;
 
 import com.esotericsoftware.minlog.Log;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.ability.ChangeZoneAi;
 import forge.ai.ability.LearnAi;

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

@@ -20,10 +20,7 @@ package forge.ai;
 import java.util.*;
 import java.util.function.Predicate;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.*;
 import forge.game.card.*;
 import forge.game.cost.*;
 import forge.util.*;

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

@@ -6,6 +6,7 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import com.google.common.collect.Iterables;
 import forge.ai.simulation.GameStateEvaluator;
 import forge.card.mana.ManaCost;
 import forge.game.card.*;

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

@@ -17,6 +17,7 @@
  */
 package forge.ai;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import forge.game.Game;
@@ -43,7 +44,6 @@ import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
 import forge.util.collect.FCollection;
@@ -2539,10 +2539,10 @@ public class ComputerUtilCombat {
             GameEntity def = combat.getDefenderByAttacker(sa.getHostCard());
             // 1. If the card that spawned the attacker was sent at a card, attack the same. Consider improving.
             if (def instanceof Card && Iterables.contains(defenders, def)) {
-                if (((Card)def).isPlaneswalker()) {
+                if (((Card) def).isPlaneswalker()) {
                     return def;
                 }
-                if (((Card)def).isBattle()) {
+                if (((Card) def).isBattle()) {
                     return def;
                 }
             }

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

@@ -1,9 +1,6 @@
 package forge.ai;
 
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
+import com.google.common.collect.*;
 import forge.LobbyPlayer;
 import forge.ai.ability.ProtectAi;
 import forge.card.CardStateName;

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

@@ -1,5 +1,6 @@
 package forge.ai;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 
 import forge.ai.ability.TokenAi;
@@ -16,7 +17,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.Expressions;
-import forge.util.Iterables;
 
 import java.util.List;
 

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

@@ -17,6 +17,7 @@
  */
 package forge.ai;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.ability.AnimateAi;
 import forge.ai.ability.FightAi;

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

@@ -1,5 +1,6 @@
 package forge.ai;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.card.CardStateName;
 import forge.card.ICardFace;
@@ -19,7 +20,6 @@ import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityCondition;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 import java.util.Collection;

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

@@ -2,6 +2,7 @@ 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;
 
@@ -20,7 +21,6 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class AmassAi extends SpellAbilityAi {
     @Override

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

@@ -3,10 +3,10 @@ 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 forge.util.Iterables;
 
 public class AssignGroupAi extends SpellAbilityAi {
 

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import forge.ai.*;
@@ -26,7 +27,6 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.staticability.StaticAbilityMustTarget;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 import org.apache.commons.lang3.StringUtils;
 

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

@@ -4,6 +4,7 @@ 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.ComputerUtilAbility;
 import forge.ai.ComputerUtilCard;
@@ -26,7 +27,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 
 public class ChooseCardAi extends SpellAbilityAi {
 

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

@@ -3,6 +3,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.StaticData;
@@ -25,7 +26,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 public class ChooseCardNameAi extends SpellAbilityAi {

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

@@ -3,6 +3,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;
@@ -12,7 +13,6 @@ import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class ChoosePlayerAi extends SpellAbilityAi {
     @Override

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

@@ -3,6 +3,7 @@ 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;
 import forge.ai.ComputerUtilCombat;
@@ -23,7 +24,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 
 public class ChooseSourceAi extends SpellAbilityAi {
 

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

@@ -5,6 +5,7 @@ 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.ComputerUtilAbility;
 import forge.ai.ComputerUtilCard;
@@ -25,7 +26,6 @@ import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 
 public class ChooseTypeAi extends SpellAbilityAi {
     @Override

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

@@ -3,6 +3,7 @@ package forge.ai.ability;
 
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
@@ -14,7 +15,6 @@ import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class ClashAi extends SpellAbilityAi {
 

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

@@ -20,6 +20,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;
@@ -42,7 +43,6 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.staticability.StaticAbilityMustTarget;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 
 
 //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

@@ -20,6 +20,7 @@ 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;
 import forge.game.card.Card;
@@ -28,7 +29,6 @@ import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 
 /**

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

@@ -5,6 +5,7 @@ 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.ComputerUtil;
 import forge.ai.ComputerUtilAbility;
@@ -30,7 +31,6 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class CopyPermanentAi extends SpellAbilityAi {
     @Override

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

@@ -3,6 +3,7 @@ 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;
 import forge.ai.SpellAbilityAi;
@@ -15,7 +16,6 @@ import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 import forge.util.collect.FCollection;
 

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.*;
 import forge.game.Game;
@@ -25,7 +26,6 @@ import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 import java.util.Collections;

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

@@ -21,6 +21,7 @@ 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;
@@ -39,7 +40,6 @@ import forge.game.player.PlayerController.BinaryChoiceType;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 /**
  * <p>

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

@@ -4,6 +4,7 @@ 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.ComputerUtilCost;
@@ -25,7 +26,6 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class CountersRemoveAi extends SpellAbilityAi {
 

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

@@ -2,6 +2,7 @@ package forge.ai.ability;
 
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilAbility;
@@ -24,7 +25,6 @@ import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.TextUtil;
 
 

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import forge.ai.*;
 import forge.game.CardTraitPredicates;
 import forge.game.Game;
@@ -23,7 +24,6 @@ import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.MagicStack;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 import forge.util.TextUtil;
 

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

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

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilAbility;
 import forge.ai.ComputerUtilCombat;
@@ -18,7 +19,6 @@ import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 public class LifeGainAi extends SpellAbilityAi {

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

@@ -2,6 +2,7 @@ package forge.ai.ability;
 
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
@@ -17,7 +18,6 @@ import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 /**

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

@@ -3,6 +3,7 @@ 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;
 import forge.ai.ComputerUtilCombat;
@@ -17,7 +18,6 @@ import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 
 public class MustBlockAi extends SpellAbilityAi {
 

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import forge.ai.AiPlayDecision;
 import forge.ai.PlayerControllerAi;
 import forge.game.ability.AbilityUtils;
@@ -8,7 +9,6 @@ import forge.game.cost.Cost;
 import forge.game.player.Player;
 import forge.game.spellability.Spell;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 public class RevealAi extends RevealAiBase {

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

@@ -1,5 +1,6 @@
 package forge.ai.ability;
 
+import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
 import forge.game.card.*;
@@ -8,7 +9,6 @@ import forge.game.player.PlayerActionConfirmMode;
 import forge.game.player.PlayerController;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 import java.util.Map;
 

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

@@ -3,6 +3,7 @@ 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.AiProps;
 import forge.ai.ComputerUtil;
@@ -39,7 +40,6 @@ import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 
 /**

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

@@ -19,8 +19,8 @@ package forge.card;
 
 import java.util.*;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import forge.util.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Maps;

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

@@ -20,19 +20,12 @@ package forge.card;
 import java.util.*;
 import java.util.function.Predicate;
 
+import com.google.common.collect.*;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
 import forge.util.Settable;
 
 /**
@@ -197,9 +190,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
     }
     public boolean addAll(final CardTypeView type) {
         boolean changed = false;
-        if (Iterables.addAll_withReturn(coreTypes, type.getCoreTypes())) { changed = true; }
-        if (Iterables.addAll_withReturn(supertypes, type.getSupertypes())) { changed = true; }
-        if (Iterables.addAll_withReturn(subtypes, type.getSubtypes())) { changed = true; }
+        if (Iterables.addAll(coreTypes, type.getCoreTypes())) { changed = true; }
+        if (Iterables.addAll(supertypes, type.getSupertypes())) { changed = true; }
+        if (Iterables.addAll(subtypes, type.getSubtypes())) { changed = true; }
         sanisfySubtypes();
         return changed;
     }

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

@@ -4,8 +4,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import com.google.common.collect.Iterables;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import org.apache.commons.lang3.tuple.Pair;
 
 import forge.StaticData;

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

@@ -18,6 +18,7 @@
 package forge.deck;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import forge.StaticData;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -31,7 +32,6 @@ import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.item.PaperCardPredicates;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 import forge.util.TextUtil;
 import org.apache.commons.lang3.Range;
 import org.apache.commons.lang3.tuple.ImmutablePair;

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

@@ -1,68 +0,0 @@
-package forge.util;
-
-import java.util.Collection;
-
-/**
- * Provides helper methods for Iterables similar to the Guava library,
- * but supporting Java 8's implementation of Iterators instead.
- */
-public class Iterables {
-    private Iterables(){}
-
-    //TODO: Restore everything below
-    public static <T> Iterable<T> unmodifiableIterable(final Iterable<? extends T> iterable) {
-        return com.google.common.collect.Iterables.unmodifiableIterable(iterable);
-    }
-
-    public static int size(Iterable<?> iterable) {
-        return com.google.common.collect.Iterables.size(iterable);
-    }
-
-    public static boolean contains(Iterable<?> iterable, Object element) {
-        return com.google.common.collect.Iterables.contains(iterable, element);
-    }
-
-    public static <T> boolean addAll_withReturn(Collection<T> collection, Iterable<? extends T> toAdd) {
-        return com.google.common.collect.Iterables.addAll(collection, toAdd);
-    }
-
-    public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b) {
-        return com.google.common.collect.Iterables.concat(a, b);
-    }
-    public static <T> Iterable<T> concat(Iterable<? extends Iterable<? extends T>> inputs) {
-        return com.google.common.collect.Iterables.concat(inputs);
-    }
-    public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c) {
-        return com.google.common.collect.Iterables.concat(a, b, c);
-    }
-    public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c, Iterable<? extends T> d) {
-        return com.google.common.collect.Iterables.concat(a, b, c, d);
-    }
-
-    public static int frequency(Iterable<?> iterable, Object element) {
-        return com.google.common.collect.Iterables.frequency(iterable, element);
-    }
-
-    public static <T> T get(Iterable<T> iterable, int position) {
-        return com.google.common.collect.Iterables.get(iterable, position);
-    }
-    
-    public static <T> T getFirst(Iterable<? extends T> iterable, T defaultValue) {
-        return com.google.common.collect.Iterables.getFirst(iterable, defaultValue);
-    }
-
-    public static <T> T getLast(Iterable<T> iterable) {
-        return com.google.common.collect.Iterables.getLast(iterable);
-    }
-    public static <T> T getLast(Iterable<? extends T> iterable, T defaultValue) {
-        return com.google.common.collect.Iterables.getLast(iterable, defaultValue);
-    }
-
-    public static <T> Iterable<T> limit(final Iterable<T> iterable, final int limitSize) {
-        return com.google.common.collect.Iterables.limit(iterable, limitSize);
-    }
-
-    public static boolean isEmpty(Iterable<?> iterable) {
-        return com.google.common.collect.Iterables.isEmpty(iterable);
-    }
-}

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;

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

@@ -14,14 +14,9 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import forge.util.Iterables;
+import com.google.common.collect.*;
 import org.apache.commons.lang3.ArrayUtils;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-
 /**
  * Collection with unique elements ({@link Set}) that maintains the order in
  * which the elements are added to it ({@link List}).

forge-game/src/main/java/forge/game/GameAction.java

@@ -53,7 +53,6 @@ import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
 import forge.util.*;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 import org.apache.commons.lang3.tuple.ImmutablePair;

forge-game/src/main/java/forge/game/GameEntityView.java

@@ -1,12 +1,12 @@
 package forge.game;
 
+import com.google.common.collect.Iterables;
 import forge.game.card.CardView;
 import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableObject;
 import forge.trackable.TrackableProperty;
 import forge.trackable.Tracker;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 
 public abstract class GameEntityView extends TrackableObject {
     private static final long serialVersionUID = -5129089945124455670L;

forge-game/src/main/java/forge/game/GameLogFormatter.java

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import com.google.common.collect.Iterables;
 import com.google.common.eventbus.Subscribe;
 
 import forge.LobbyPlayer;

forge-game/src/main/java/forge/game/GameView.java

@@ -2,6 +2,7 @@ package forge.game;
 
 import java.util.List;
 
+import com.google.common.collect.Iterables;
 import forge.LobbyPlayer;
 import forge.deck.Deck;
 import forge.game.GameOutcome.AnteResult;
@@ -19,7 +20,6 @@ import forge.game.zone.MagicStack;
 import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableObject;
 import forge.trackable.TrackableProperty;
-import forge.util.Iterables;
 import forge.util.collect.FCollectionView;
 
 public class GameView extends TrackableObject {

forge-game/src/main/java/forge/game/Match.java

@@ -1,11 +1,6 @@
 package forge.game;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multiset;
+import com.google.common.collect.*;
 import com.google.common.eventbus.EventBus;
 import forge.LobbyPlayer;
 import forge.deck.CardPool;
@@ -25,7 +20,6 @@ import forge.game.trigger.Trigger;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
-import forge.util.Iterables;
 import forge.util.Localizer;
 import forge.util.MyRandom;
 import forge.util.collect.FCollectionView;

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -30,7 +30,6 @@ import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.*;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 import io.sentry.Breadcrumb;

forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java

@@ -1,5 +1,6 @@
 package forge.game.ability;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;

forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java

@@ -4,6 +4,7 @@ package forge.game.ability.effects;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.game.Game;
 import forge.game.GameActionUtil;
 import forge.game.GameEntity;
@@ -21,7 +22,6 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.CardTranslation;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.Localizer;
 import forge.util.collect.FCollection;

forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java

@@ -1,12 +1,12 @@
 package forge.game.ability.effects;
 
+import com.google.common.collect.Iterables;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 import forge.util.Localizer;
 import forge.util.collect.FCollection;
 

forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
-import forge.util.Iterables;
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java

@@ -3,6 +3,7 @@ package forge.game.ability.effects;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.game.Game;
 import forge.game.GameActionUtil;
 import forge.game.GameEntityCounterTable;
@@ -15,7 +16,6 @@ import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.Localizer;
 import forge.util.TextUtil;

forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java

@@ -1,5 +1,6 @@
 package forge.game.ability.effects;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 

forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java

@@ -2,6 +2,7 @@ package forge.game.ability.effects;
 
 import java.util.List;
 
+import com.google.common.collect.Iterables;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.SpellAbilityEffect;
@@ -9,7 +10,6 @@ import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
-import forge.util.Iterables;
 
 public class ControlSpellEffect extends SpellAbilityEffect {
     /* (non-Javadoc)

forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.game.Game;

forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java

@@ -2,6 +2,7 @@ package forge.game.ability.effects;
 
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 
 import forge.GameCommand;
@@ -15,7 +16,6 @@ import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerHandler;
-import forge.util.Iterables;
 
 public class DelayedTriggerEffect extends SpellAbilityEffect {
 

forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java

@@ -3,6 +3,7 @@ package forge.game.ability.effects;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 

forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java

@@ -1,5 +1,6 @@
 package forge.game.ability.effects;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.StaticData;
 import forge.card.ICardFace;

forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -17,7 +18,6 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.Localizer;
 

forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.GameCommand;
@@ -18,7 +19,6 @@ import forge.game.event.GameEventCardStatsChanged;
 import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
 public class PumpAllEffect extends SpellAbilityEffect {
 

forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java

@@ -2,6 +2,7 @@ package forge.game.ability.effects;
 
 import java.util.List;
 
+import com.google.common.collect.Iterables;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
@@ -10,7 +11,6 @@ import forge.game.card.CardCollectionView;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.Localizer;
 

forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java

@@ -5,9 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.Iterables;
 import forge.card.GamePieceType;
 import forge.game.card.*;
-import forge.util.Iterables;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.google.common.collect.Lists;

forge-game/src/main/java/forge/game/card/Card.java

@@ -51,7 +51,6 @@ import forge.item.PaperCard;
 import forge.trackable.TrackableProperty;
 import forge.trackable.Tracker;
 import forge.util.*;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 import io.sentry.Breadcrumb;

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -17,10 +17,7 @@
  */
 package forge.game.card;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.common.collect.*;
 import forge.GameCommand;
 import forge.card.*;
 import forge.card.mana.ManaCost;

forge-game/src/main/java/forge/game/card/CardProperty.java

@@ -1,5 +1,6 @@
 package forge.game.card;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import forge.StaticData;
@@ -28,7 +29,6 @@ import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
 import forge.util.Expressions;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import forge.util.TextUtil;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;

forge-game/src/main/java/forge/game/card/CardState.java

@@ -22,6 +22,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 
 import forge.card.CardEdition;
@@ -48,7 +49,6 @@ import forge.game.spellability.SpellPermanent;
 import forge.game.staticability.StaticAbility;
 import forge.game.trigger.Trigger;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import forge.util.ITranslatable;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;

forge-game/src/main/java/forge/game/card/CardView.java

@@ -1,5 +1,6 @@
 package forge.game.card;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import forge.ImageKeys;
 import forge.StaticData;

forge-game/src/main/java/forge/game/card/CardZoneTable.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import com.google.common.collect.ForwardingTable;
 import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Table;
 import forge.game.CardTraitBase;
 import forge.game.Game;
@@ -18,7 +19,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 
 public class CardZoneTable extends ForwardingTable<ZoneType, ZoneType, CardCollection> {
     // TODO use EnumBasedTable if exist

forge-game/src/main/java/forge/game/card/token/TokenInfo.java

@@ -3,8 +3,8 @@ package forge.game.card.token;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.card.GamePieceType;
-import forge.util.Iterables;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 

forge-game/src/main/java/forge/game/combat/AttackConstraints.java

@@ -9,15 +9,10 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Predicate;
 
+import com.google.common.collect.*;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 
 import forge.game.Game;

forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java

@@ -3,7 +3,7 @@ package forge.game.event;
 import java.util.Arrays;
 import java.util.Collection;
 
-import forge.util.Iterables;
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.game.card.Card;

forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java

@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
 
+import com.google.common.collect.Iterables;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
@@ -512,7 +512,7 @@ public class ManaCostBeingPaid {
             return null;
         }
 
-       return Iterables.getFirst(choice, null);
+        return Iterables.getFirst(choice, null);
     }
 
     private ManaCostShard tryPayMana(final byte colorMask, Iterable<ManaCostShard> payableShards, byte possibleUses) {

forge-game/src/main/java/forge/game/player/Player.java

@@ -54,7 +54,6 @@ import forge.game.zone.ZoneType;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.util.*;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
 import org.apache.commons.lang3.tuple.ImmutablePair;

forge-game/src/main/java/forge/game/player/PlayerProperty.java

@@ -1,5 +1,6 @@
 package forge.game.player;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.game.CardTraitBase;
 import forge.game.Game;
@@ -10,7 +11,6 @@ import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.zone.ZoneType;
 import forge.util.Expressions;
-import forge.util.Iterables;
 import forge.util.TextUtil;
 
 import java.util.*;

forge-game/src/main/java/forge/game/player/PlayerView.java

@@ -2,6 +2,7 @@ package forge.game.player;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import forge.LobbyPlayer;
@@ -19,7 +20,6 @@ import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableProperty;
 import forge.trackable.Tracker;
 import forge.util.CardTranslation;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.Localizer;
 import forge.util.collect.FCollection;

forge-game/src/main/java/forge/game/player/RegisteredPlayer.java

@@ -1,5 +1,6 @@
 package forge.game.player;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.LobbyPlayer;
 import forge.deck.CardPool;
@@ -8,7 +9,6 @@ import forge.deck.DeckSection;
 import forge.game.GameType;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
-import forge.util.Iterables;
 
 import java.util.Collections;
 import java.util.List;

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -19,12 +19,7 @@ package forge.game.spellability;
 
 import java.util.*;
 
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Table;
-import com.google.common.collect.TreeBasedTable;
+import com.google.common.collect.*;
 
 import forge.game.cost.CostSacrifice;
 import forge.util.*;

forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java

@@ -17,6 +17,7 @@
  */
 package forge.game.spellability;
 
+import com.google.common.collect.Iterables;
 import forge.card.ColorSet;
 import forge.game.Game;
 import forge.game.GameObject;
@@ -29,7 +30,6 @@ import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.Expressions;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import org.apache.commons.lang3.StringUtils;
 

forge-game/src/main/java/forge/game/spellability/TargetChoices.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.ForwardingList;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 
 import forge.game.GameEntity;
@@ -31,7 +32,6 @@ import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
 import forge.game.player.Player;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 
 /**

forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java

@@ -18,6 +18,7 @@
 package forge.game.staticability;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import forge.GameCommand;
@@ -40,7 +41,6 @@ import forge.game.spellability.AbilityStatic;
 import forge.game.spellability.SpellAbility;
 import forge.game.trigger.Trigger;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 

forge-game/src/main/java/forge/game/trigger/Trigger.java

@@ -17,6 +17,7 @@
  */
 package forge.game.trigger;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import forge.game.*;
@@ -36,7 +37,6 @@ import forge.game.zone.CostPaymentStack;
 import forge.game.zone.ZoneType;
 import forge.util.CardTranslation;
 import forge.util.ITranslatable;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.TextUtil;
 

forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java

@@ -18,12 +18,12 @@
 package forge.game.trigger;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardZoneTable;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 import forge.util.Localizer;
 import forge.util.TextUtil;
 

forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java

@@ -19,11 +19,11 @@ package forge.game.trigger;
 
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 import forge.util.Localizer;
 
 /**

forge-game/src/main/java/forge/game/trigger/TriggerHandler.java

@@ -19,10 +19,7 @@ package forge.game.trigger;
 
 import java.util.*;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimaps;
+import com.google.common.collect.*;
 
 import forge.game.CardTraitBase;
 import forge.game.CardTraitPredicates;
@@ -40,7 +37,6 @@ import forge.game.staticability.StaticAbilityPanharmonicon;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.util.FileSection;
-import forge.util.Iterables;
 import forge.util.Visitor;
 import io.sentry.Breadcrumb;
 import io.sentry.Sentry;

forge-game/src/main/java/forge/game/zone/PlayerZone.java

@@ -17,13 +17,13 @@
  */
 package forge.game.zone;
 
+import com.google.common.collect.Iterables;
 import forge.card.CardStateName;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
-import forge.util.Iterables;
 import forge.util.Lang;
 
 import java.util.function.Predicate;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java

@@ -12,7 +12,7 @@ import javax.swing.JPopupMenu;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
 
-import forge.util.Iterables;
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.ArrayUtils;
 
 import com.google.common.collect.ImmutableList;

forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java

@@ -2,10 +2,10 @@ package forge.screens.bazaar;
 
 import javax.swing.SwingUtilities;
 
+import com.google.common.collect.Iterables;
 import forge.gamemodes.quest.bazaar.QuestBazaarManager;
 import forge.gui.framework.ICDoc;
 import forge.toolbox.FLabel;
-import forge.util.Iterables;
 
 public enum CBazaarUI implements ICDoc {
     SINGLETON_INSTANCE;

forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java

@@ -5,12 +5,12 @@ import java.util.Vector;
 
 import javax.swing.SwingUtilities;
 
+import com.google.common.collect.Iterables;
 import forge.deck.DeckProxy;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 import forge.toolbox.FList;
-import forge.util.Iterables;
 
 public class CLobby {
 

forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java

@@ -14,6 +14,7 @@ import javax.swing.*;
 import javax.swing.event.ListSelectionListener;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.ai.AIOption;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java

@@ -1,6 +1,6 @@
 package forge.screens.match.controllers;
 
-import forge.util.Iterables;
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.game.GameEntityView;

forge-gui-desktop/src/main/java/forge/screens/workshop/views/VWorkshopCatalog.java

@@ -2,6 +2,7 @@ package forge.screens.workshop.views;
 
 import javax.swing.JPanel;
 
+import com.google.common.collect.Iterables;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
@@ -14,7 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
 import forge.screens.workshop.controllers.CCardScript;
 import forge.screens.workshop.controllers.CWorkshopCatalog;
 import forge.util.ItemPool;
-import forge.util.Iterables;
 import forge.util.Localizer;
 import net.miginfocom.swing.MigLayout;
 

forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java

@@ -1,5 +1,6 @@
 package forge.gamesimulationtests.util;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
@@ -47,7 +48,6 @@ import forge.item.PaperCard;
 import forge.player.HumanPlay;
 import forge.util.Aggregates;
 import forge.util.ITriggerEvent;
-import forge.util.Iterables;
 import forge.util.MyRandom;
 import forge.util.collect.FCollectionView;
 import org.apache.commons.lang3.tuple.ImmutablePair;

forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java

@@ -3,7 +3,7 @@ package forge.gamesimulationtests.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.util.Iterables;
+import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 public abstract class SpecificationHandler<TYPE, SPECIFICATION extends Specification<TYPE>> {

forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java

@@ -1,5 +1,6 @@
 package forge.item;
 
+import com.google.common.collect.Iterables;
 import forge.GuiDesktop;
 import forge.card.CardRarity;
 import forge.card.CardRules;
@@ -7,7 +8,6 @@ import forge.card.DeckHints;
 import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
-import forge.util.Iterables;
 import junit.framework.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

forge-gui-mobile/src/forge/adventure/data/RewardData.java

@@ -1,6 +1,7 @@
 package forge.adventure.data;
 
 import com.badlogic.gdx.utils.Array;
+import com.google.common.collect.Iterables;
 import forge.StaticData;
 import forge.adventure.util.CardUtil;
 import forge.adventure.util.Config;
@@ -10,7 +11,6 @@ import forge.adventure.world.WorldSave;
 import forge.deck.Deck;
 import forge.item.PaperCard;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 
 import java.io.Serializable;
 import java.util.*;

forge-gui-mobile/src/forge/adventure/util/CardUtil.java

@@ -2,6 +2,7 @@ package forge.adventure.util;
 
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.Json;
+import com.google.common.collect.Iterables;
 import forge.StaticData;
 import forge.adventure.data.ConfigData;
 import forge.adventure.data.GeneratedDeckData;
@@ -21,7 +22,6 @@ import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
 import forge.util.Aggregates;
 import forge.util.IterableUtil;
-import forge.util.Iterables;
 
 import java.text.SimpleDateFormat;
 import java.util.*;

forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java

@@ -2,6 +2,7 @@ package forge.itemmanager.filters;
 
 import com.badlogic.gdx.utils.Align;
 
+import com.google.common.collect.Iterables;
 import forge.Forge;
 import forge.assets.FSkinImage;
 import forge.assets.TextRenderer;
@@ -24,7 +25,6 @@ import forge.toolbox.FList;
 import forge.toolbox.FScrollPane;
 import forge.toolbox.FTextField;
 import forge.util.Callback;
-import forge.util.Iterables;
 
 import java.util.function.Predicate;
 

forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java

@@ -6,8 +6,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Iterables;
 import forge.player.GamePlayerUtil;
-import forge.util.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
 import com.badlogic.gdx.Gdx;

forge-gui-mobile/src/forge/screens/match/views/VReveal.java

@@ -1,6 +1,7 @@
 package forge.screens.match.views;
 
 import com.badlogic.gdx.utils.Align;
+import com.google.common.collect.Iterables;
 import forge.Forge;
 import forge.Graphics;
 import forge.assets.FImage;
@@ -17,7 +18,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.util.CardTranslation;
 import forge.util.ImageUtil;
-import forge.util.Iterables;
 import forge.util.Utils;
 
 import java.util.ArrayList;

forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java

@@ -10,6 +10,7 @@ import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.utils.Align;
 import com.google.common.collect.ImmutableList;
 
+import com.google.common.collect.Iterables;
 import forge.Forge;
 import forge.Graphics;
 import forge.animation.ForgeAnimation;