From 6a04fcd50057bb478d509dfabb1fef819fd7c35d Mon Sep 17 00:00:00 2001 From: Jetz Date: Thu, 26 Sep 2024 09:36:50 -0400 Subject: [PATCH] Guava migration - Remove migration scaffold --- .../java/forge/ai/AiAttackController.java | 1 + .../src/main/java/forge/ai/AiController.java | 1 + .../src/main/java/forge/ai/ComputerUtil.java | 5 +- .../main/java/forge/ai/ComputerUtilCard.java | 1 + .../java/forge/ai/ComputerUtilCombat.java | 6 +- .../java/forge/ai/PlayerControllerAi.java | 5 +- .../main/java/forge/ai/SpecialAiLogic.java | 2 +- .../src/main/java/forge/ai/SpecialCardAi.java | 1 + .../main/java/forge/ai/SpellAbilityAi.java | 4 +- .../main/java/forge/ai/ability/AmassAi.java | 2 +- .../java/forge/ai/ability/AssignGroupAi.java | 4 +- .../java/forge/ai/ability/ChangeZoneAi.java | 2 +- .../java/forge/ai/ability/ChooseCardAi.java | 2 +- .../forge/ai/ability/ChooseCardNameAi.java | 2 +- .../java/forge/ai/ability/ChoosePlayerAi.java | 2 +- .../java/forge/ai/ability/ChooseSourceAi.java | 2 +- .../java/forge/ai/ability/ChooseTypeAi.java | 2 +- .../main/java/forge/ai/ability/ClashAi.java | 2 +- .../java/forge/ai/ability/ControlGainAi.java | 2 +- .../ai/ability/ControlGainVariantAi.java | 2 +- .../forge/ai/ability/CopyPermanentAi.java | 2 +- .../java/forge/ai/ability/CountersMoveAi.java | 2 +- .../java/forge/ai/ability/CountersPutAi.java | 2 +- .../ai/ability/CountersPutOrRemoveAi.java | 2 +- .../forge/ai/ability/CountersRemoveAi.java | 2 +- .../src/main/java/forge/ai/ability/DigAi.java | 2 +- .../main/java/forge/ai/ability/EffectAi.java | 2 +- .../forge/ai/ability/LegendaryRuleAi.java | 2 +- .../java/forge/ai/ability/LifeGainAi.java | 2 +- .../java/forge/ai/ability/ManifestBaseAi.java | 2 +- .../java/forge/ai/ability/MustBlockAi.java | 2 +- .../main/java/forge/ai/ability/RevealAi.java | 2 +- .../java/forge/ai/ability/TimeTravelAi.java | 2 +- .../main/java/forge/ai/ability/TokenAi.java | 2 +- .../src/main/java/forge/card/CardRules.java | 2 +- .../src/main/java/forge/card/CardType.java | 15 ++-- .../src/main/java/forge/card/DeckHints.java | 2 +- .../src/main/java/forge/deck/DeckFormat.java | 2 +- .../src/main/java/forge/util/Iterables.java | 68 ------------------- forge-core/src/main/java/forge/util/Lang.java | 1 + .../java/forge/util/collect/FCollection.java | 7 +- .../src/main/java/forge/game/GameAction.java | 1 - .../main/java/forge/game/GameEntityView.java | 2 +- .../java/forge/game/GameLogFormatter.java | 1 + .../src/main/java/forge/game/GameView.java | 2 +- .../src/main/java/forge/game/Match.java | 8 +-- .../java/forge/game/ability/AbilityUtils.java | 1 - .../game/ability/SpellAbilityEffect.java | 1 + .../game/ability/effects/AttachEffect.java | 2 +- .../game/ability/effects/BidLifeEffect.java | 2 +- .../ability/effects/ChangeTargetsEffect.java | 2 +- .../ability/effects/ChangeZoneAllEffect.java | 2 +- .../ability/effects/ChangeZoneEffect.java | 1 + .../ability/effects/ControlSpellEffect.java | 2 +- .../ability/effects/DamageDealEffect.java | 1 + .../ability/effects/DelayedTriggerEffect.java | 2 +- .../game/ability/effects/DiscardEffect.java | 1 + .../game/ability/effects/MakeCardEffect.java | 1 + .../ability/effects/MultiplePilesEffect.java | 2 +- .../game/ability/effects/PumpAllEffect.java | 2 +- .../effects/RearrangeTopOfLibraryEffect.java | 2 +- .../game/ability/effects/TokenEffectBase.java | 2 +- .../src/main/java/forge/game/card/Card.java | 1 - .../java/forge/game/card/CardFactoryUtil.java | 5 +- .../java/forge/game/card/CardProperty.java | 2 +- .../main/java/forge/game/card/CardState.java | 2 +- .../main/java/forge/game/card/CardView.java | 1 + .../java/forge/game/card/CardZoneTable.java | 2 +- .../java/forge/game/card/token/TokenInfo.java | 2 +- .../forge/game/combat/AttackConstraints.java | 7 +- .../game/event/GameEventCardStatsChanged.java | 2 +- .../forge/game/mana/ManaCostBeingPaid.java | 4 +- .../main/java/forge/game/player/Player.java | 1 - .../forge/game/player/PlayerProperty.java | 2 +- .../java/forge/game/player/PlayerView.java | 2 +- .../forge/game/player/RegisteredPlayer.java | 2 +- .../forge/game/spellability/SpellAbility.java | 7 +- .../spellability/SpellAbilityCondition.java | 2 +- .../game/spellability/TargetChoices.java | 2 +- .../StaticAbilityContinuous.java | 2 +- .../main/java/forge/game/trigger/Trigger.java | 2 +- .../game/trigger/TriggerAbilityTriggered.java | 2 +- .../game/trigger/TriggerAttackerBlocked.java | 2 +- .../forge/game/trigger/TriggerHandler.java | 6 +- .../main/java/forge/game/zone/PlayerZone.java | 2 +- .../filters/AdvancedSearchFilter.java | 2 +- .../java/forge/screens/bazaar/CBazaarUI.java | 2 +- .../main/java/forge/screens/home/CLobby.java | 2 +- .../main/java/forge/screens/home/VLobby.java | 1 + .../screens/match/controllers/CCombat.java | 2 +- .../workshop/views/VWorkshopCatalog.java | 2 +- .../util/PlayerControllerForTests.java | 2 +- .../util/SpecificationHandler.java | 2 +- .../test/java/forge/item/DeckHintsTest.java | 2 +- .../src/forge/adventure/data/RewardData.java | 2 +- .../src/forge/adventure/util/CardUtil.java | 2 +- .../filters/AdvancedSearchFilter.java | 2 +- .../screens/constructed/LobbyScreen.java | 2 +- .../forge/screens/match/views/VReveal.java | 2 +- .../planarconquest/ConquestAEtherScreen.java | 1 + .../planarconquest/NewConquestScreen.java | 2 +- .../src/forge/toolbox/GuiChoose.java | 2 +- .../java/forge/deck/RandomDeckGenerator.java | 5 +- .../forge/gamemodes/limited/CardRanker.java | 2 +- .../gamemodes/limited/LimitedPlayer.java | 2 +- .../gamemodes/limited/SealedDeckBuilder.java | 2 +- .../gamemodes/match/AbstractGuiGame.java | 7 +- .../match/input/InputSelectManyBase.java | 2 +- .../match/input/InputSelectTargets.java | 1 + .../download/GuiDownloadSetPicturesLQ.java | 2 +- .../main/java/forge/gui/util/SGuiChoose.java | 2 +- .../java/forge/player/HumanCostDecision.java | 1 + .../src/main/java/forge/player/HumanPlay.java | 5 +- .../forge/player/HumanPlaySpellAbility.java | 2 +- .../forge/player/PlayerControllerHuman.java | 1 - 115 files changed, 120 insertions(+), 223 deletions(-) delete mode 100644 forge-core/src/main/java/forge/util/Iterables.java diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 8deb61891d0..8b52c51dba5 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 7f603a8719e..d82ffe69408 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index aceccc32aab..ef2237e2f8b 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/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.*; diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index e19e39fd980..f4d589a2e5e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/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.*; diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java index 0afca935bc1..1decb6e77b4 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/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; } } diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 5136a9e8096..773c2a7ebe8 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java b/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java index 77ddf327c18..0bb9c6f0dae 100644 --- a/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java index 91b0457a3a8..96981dc84d7 100644 --- a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java b/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java index 95742d46631..df9b899de51 100644 --- a/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java +++ b/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; @@ -361,7 +361,7 @@ public abstract class SpellAbilityAi { public String chooseCardName(Player ai, SpellAbility sa, List faces) { System.err.println("Warning: default (ie. inherited from base class) implementation of chooseCardName is used for " + this.getClass().getName() + ". Consider declaring an overloaded method"); - final ICardFace face = Iterables.getFirst(faces, null); + final ICardFace face = Iterables.getFirst(faces, null); return face == null ? "" : face.getName(); } diff --git a/forge-ai/src/main/java/forge/ai/ability/AmassAi.java b/forge-ai/src/main/java/forge/ai/ability/AmassAi.java index 31adb3781b8..66e272af130 100644 --- a/forge-ai/src/main/java/forge/ai/ability/AmassAi.java +++ b/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 diff --git a/forge-ai/src/main/java/forge/ai/ability/AssignGroupAi.java b/forge-ai/src/main/java/forge/ai/ability/AssignGroupAi.java index d97cbda5aab..abf8b22cf49 100644 --- a/forge-ai/src/main/java/forge/ai/ability/AssignGroupAi.java +++ b/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 { @@ -26,7 +26,7 @@ public class AssignGroupAi extends SpellAbilityAi { return spells.get(player.isOpponentOf(t) ? 1 : 0); } } - + return Iterables.getFirst(spells, null); } } diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java index d11af4a45e9..b6cf58d4b09 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java index 6f01a7ea4cd..fc40e652d68 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java index affe9aeaaba..6f16595eedb 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/ChoosePlayerAi.java b/forge-ai/src/main/java/forge/ai/ability/ChoosePlayerAi.java index a8a03436699..d2e1aed14a1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChoosePlayerAi.java +++ b/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 diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseSourceAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseSourceAi.java index 43bbf5dc13b..52e44bb50db 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseSourceAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java index b85501fe732..fca70976b61 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java +++ b/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 diff --git a/forge-ai/src/main/java/forge/ai/ability/ClashAi.java b/forge-ai/src/main/java/forge/ai/ability/ClashAi.java index 4e4f4c5f77c..30efdfe6b3e 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ClashAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java b/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java index a84edee7d00..7f7c70bd8fb 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java +++ b/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 diff --git a/forge-ai/src/main/java/forge/ai/ability/ControlGainVariantAi.java b/forge-ai/src/main/java/forge/ai/ability/ControlGainVariantAi.java index b7ffe94c3b4..8c43ea29c56 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ControlGainVariantAi.java +++ b/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; /** diff --git a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java index a4082a42c74..c0fe8337941 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java +++ b/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 diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java index 77fe4368de7..40018954cee 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java index 704ded794a2..4a2e467b986 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java index 26309cec653..bd59630e797 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java +++ b/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; /** *

diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java index d411413e61b..3ddaa19cf13 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/DigAi.java b/forge-ai/src/main/java/forge/ai/ability/DigAi.java index 9e8ce50009f..79f8ca128fe 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DigAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java index 699a4c053a8..263ce13df5a 100644 --- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/LegendaryRuleAi.java b/forge-ai/src/main/java/forge/ai/ability/LegendaryRuleAi.java index e6ffd0c60a4..45c7060d34f 100644 --- a/forge-ai/src/main/java/forge/ai/ability/LegendaryRuleAi.java +++ b/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. diff --git a/forge-ai/src/main/java/forge/ai/ability/LifeGainAi.java b/forge-ai/src/main/java/forge/ai/ability/LifeGainAi.java index 1907f315e98..2462fd6d716 100644 --- a/forge-ai/src/main/java/forge/ai/ability/LifeGainAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/ManifestBaseAi.java b/forge-ai/src/main/java/forge/ai/ability/ManifestBaseAi.java index 85a35809895..5dbf8617ec8 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ManifestBaseAi.java +++ b/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; /** diff --git a/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java b/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java index 0be815470e0..b8c21e2dda8 100644 --- a/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/RevealAi.java b/forge-ai/src/main/java/forge/ai/ability/RevealAi.java index 7bb856b3b5a..7acb1e17ff5 100644 --- a/forge-ai/src/main/java/forge/ai/ability/RevealAi.java +++ b/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 { diff --git a/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java b/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java index 8aa29b830d7..db08e348fe1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java +++ b/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; diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java index 7407e41fb4c..ee1587d4ca6 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java +++ b/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; /** diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index 691734bb135..5fd541fda23 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/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; diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java index a38d0872a4e..b3a95c0e7bd 100644 --- a/forge-core/src/main/java/forge/card/CardType.java +++ b/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, 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; } diff --git a/forge-core/src/main/java/forge/card/DeckHints.java b/forge-core/src/main/java/forge/card/DeckHints.java index 0e617d55535..a813d75ec8b 100644 --- a/forge-core/src/main/java/forge/card/DeckHints.java +++ b/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; diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index c7f0e055126..169d5fdca2b 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/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; diff --git a/forge-core/src/main/java/forge/util/Iterables.java b/forge-core/src/main/java/forge/util/Iterables.java deleted file mode 100644 index 02f1d2e0721..00000000000 --- a/forge-core/src/main/java/forge/util/Iterables.java +++ /dev/null @@ -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 Iterable unmodifiableIterable(final Iterable 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 boolean addAll_withReturn(Collection collection, Iterable toAdd) { - return com.google.common.collect.Iterables.addAll(collection, toAdd); - } - - public static Iterable concat(Iterable a, Iterable b) { - return com.google.common.collect.Iterables.concat(a, b); - } - public static Iterable concat(Iterable> inputs) { - return com.google.common.collect.Iterables.concat(inputs); - } - public static Iterable concat(Iterable a, Iterable b, Iterable c) { - return com.google.common.collect.Iterables.concat(a, b, c); - } - public static Iterable concat(Iterable a, Iterable b, Iterable c, Iterable 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 get(Iterable iterable, int position) { - return com.google.common.collect.Iterables.get(iterable, position); - } - - public static T getFirst(Iterable iterable, T defaultValue) { - return com.google.common.collect.Iterables.getFirst(iterable, defaultValue); - } - - public static T getLast(Iterable iterable) { - return com.google.common.collect.Iterables.getLast(iterable); - } - public static T getLast(Iterable iterable, T defaultValue) { - return com.google.common.collect.Iterables.getLast(iterable, defaultValue); - } - - public static Iterable limit(final Iterable 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); - } -} diff --git a/forge-core/src/main/java/forge/util/Lang.java b/forge-core/src/main/java/forge/util/Lang.java index cfd0053b4e2..f6674cb1d1f 100644 --- a/forge-core/src/main/java/forge/util/Lang.java +++ b/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; diff --git a/forge-core/src/main/java/forge/util/collect/FCollection.java b/forge-core/src/main/java/forge/util/collect/FCollection.java index c2bad40335b..7753a2a918f 100644 --- a/forge-core/src/main/java/forge/util/collect/FCollection.java +++ b/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}). diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 7b2743b4396..c21debe0165 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/GameEntityView.java b/forge-game/src/main/java/forge/game/GameEntityView.java index 90ccca22323..9b7a1b3a0f7 100644 --- a/forge-game/src/main/java/forge/game/GameEntityView.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java index 4f67bb4b74e..cbea29a7d95 100644 --- a/forge-game/src/main/java/forge/game/GameLogFormatter.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/GameView.java b/forge-game/src/main/java/forge/game/GameView.java index 476d94cb721..10e0da7a76b 100644 --- a/forge-game/src/main/java/forge/game/GameView.java +++ b/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 { diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java index 109e6c2da53..2c5b7e3605e 100644 --- a/forge-game/src/main/java/forge/game/Match.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 5e72902f9df..aa8fec0b5d5 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 052223b214c..78d127ecfb3 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java index 014d3433e0b..386af44b332 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java index 39490a706a0..bf86680c19b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java index d8a202fd944..7cf05cd02af 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index 9686580fbfd..a3cb790e883 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index d575b8fa318..f4ace0bfc4b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java index 232342da635..2b694f5fe73 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java +++ b/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) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java index 395fa8a4bc6..ff78d9b5d1c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index 49090d00e98..f75f623a420 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java +++ b/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 { diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java index aba04ddf64c..3a16eeae9a2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java index bb85e022ff5..8ff2792d476 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java index aaf74f1dcc4..6fdbbb0c984 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java index 4a44c77d979..28df9b4a6cb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java +++ b/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 { diff --git a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java index c1e4110fd92..1c55d999a89 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java index a7b06f64d00..521e81a49b8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index ccaab0dba50..a78801658f1 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 672f6d6e521..565a95051a8 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index 416ad52b979..96e5b600c6b 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/CardState.java b/forge-game/src/main/java/forge/game/card/CardState.java index 34a9e1eb5c2..8a0747f5a22 100644 --- a/forge-game/src/main/java/forge/game/card/CardState.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 0fb67c24b58..682402225e0 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/card/CardZoneTable.java b/forge-game/src/main/java/forge/game/card/CardZoneTable.java index 727ab1baf23..a2daf717bb7 100644 --- a/forge-game/src/main/java/forge/game/card/CardZoneTable.java +++ b/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 { // TODO use EnumBasedTable if exist diff --git a/forge-game/src/main/java/forge/game/card/token/TokenInfo.java b/forge-game/src/main/java/forge/game/card/token/TokenInfo.java index 35ea443f86c..07b142edb66 100644 --- a/forge-game/src/main/java/forge/game/card/token/TokenInfo.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java index 96d9af10dcf..afcb0f1b066 100644 --- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java index 13470f7a40c..f58f4c85e11 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java index 963f3c5f48c..47657b7b42f 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java +++ b/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 payableShards, byte possibleUses) { diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 2e9fe7f1b85..8729ca9071f 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java index 182d843e034..d7a3d077c9a 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java +++ b/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.*; diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index d2ab87a88c0..d7c78cf1ab9 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java index a6157f088c3..8967d91df3c 100644 --- a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 3d2474931ef..a997896f732 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/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.*; diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java index 6dc9828d3ab..80967bea5a5 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java index 14b3361c321..aa99ed3fd16 100644 --- a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java +++ b/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; /** diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 50c9454f2d0..b9b44973165 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index cd57524b07a..9ab6ac9d7f1 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java b/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java index 1f8de3bb69c..e17b405baf6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java index 9a0ba429d09..3f6ada026e7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java +++ b/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; /** diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index d86382aa9b7..19e8a49af2c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZone.java b/forge-game/src/main/java/forge/game/zone/PlayerZone.java index 7d8d094fa0e..4778fe162ff 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZone.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java index 7133acabc92..58e423c0175 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java b/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java index e74181e78e0..9e44c44ab9a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java index e584792d408..a637bf4c303 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java +++ b/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 { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 80b6125bc37..d555ad6b71e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java index c460771c1f8..c11b1c9a41f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/workshop/views/VWorkshopCatalog.java b/forge-gui-desktop/src/main/java/forge/screens/workshop/views/VWorkshopCatalog.java index cea2223a981..7b7f4c937b3 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/workshop/views/VWorkshopCatalog.java +++ b/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; diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java index 612cac56293..639e4d26928 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java +++ b/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; diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java index 1d9ab87a536..e43ab4735da 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java +++ b/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> { diff --git a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java index 3cad6f8a551..b82e3aee81e 100644 --- a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java index 67b2352de71..1e95f6ae534 100644 --- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java +++ b/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.*; diff --git a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java index 1f19f9fc3c2..f1e87bb344d 100644 --- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java +++ b/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.*; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index 39aaee29eef..02d9465dc62 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index 4bb268079b1..6b54d729833 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VReveal.java b/forge-gui-mobile/src/forge/screens/match/views/VReveal.java index f162ca4d215..ae0a15d99ca 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VReveal.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index f92b38be18d..ac451ffdd1e 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index f6cb6a9490d..95e170a17ca 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -1,5 +1,6 @@ package forge.screens.planarconquest; +import com.google.common.collect.Iterables; import forge.Forge; import forge.assets.FImage; import forge.card.CardImage; @@ -18,7 +19,6 @@ import forge.screens.home.NewGameMenu; import forge.screens.planarconquest.ConquestMenu.LaunchReason; import forge.toolbox.FChoiceList; import forge.toolbox.FOptionPane; -import forge.util.Iterables; import forge.util.ThreadUtil; public class NewConquestScreen extends MultiStepWizardScreen { diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index 8f762fad64d..09e642050b7 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java @@ -7,8 +7,8 @@ import java.util.Comparator; import java.util.List; import java.util.function.Function; +import com.google.common.collect.Iterables; import forge.Forge; -import forge.util.Iterables; import org.apache.commons.lang3.StringUtils; import forge.game.card.CardView; diff --git a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java index 841fbb83035..aa21438e909 100644 --- a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java +++ b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java @@ -3,6 +3,7 @@ package forge.deck; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.Iterables; import forge.game.GameFormat; import forge.game.GameType; import forge.game.IHasGameType; @@ -10,7 +11,6 @@ import forge.gamemodes.quest.QuestController; import forge.model.FModel; import forge.util.Aggregates; import forge.util.IterableUtil; -import forge.util.Iterables; public class RandomDeckGenerator extends DeckProxy implements Comparable { private enum RandomDeckType { @@ -174,8 +174,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable AIDecks = IterableUtil.filter(decks, deckProxy -> deckProxy.getAI().inMainDeck == 0); - if (isAi && Iterables.size(AIDecks) > 10) - return Aggregates.random(AIDecks).getDeck(); + if (isAi && Iterables.size(AIDecks) > 10) return Aggregates.random(AIDecks).getDeck(); return Aggregates.random(decks).getDeck(); } diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java index 32ca4f394c9..21660e5abc4 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java @@ -1,12 +1,12 @@ package forge.gamemodes.limited; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.DeckHints; import forge.card.MagicColor; import forge.item.PaperCard; -import forge.util.Iterables; import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayer.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayer.java index bac699548a2..d705025ec4d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayer.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedPlayer.java @@ -1,5 +1,6 @@ package forge.gamemodes.limited; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import forge.card.CardEdition; @@ -10,7 +11,6 @@ import forge.deck.DeckSection; import forge.gui.util.SGuiChoose; import forge.item.PaperCard; import forge.model.FModel; -import forge.util.Iterables; import forge.util.TextUtil; import java.util.*; diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/SealedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/SealedDeckBuilder.java index 60d6aa99c8a..d5908dc050c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/SealedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/SealedDeckBuilder.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.google.common.collect.Iterables; import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.card.ColorSet; import forge.card.MagicColor; import forge.item.PaperCard; import forge.util.IterableUtil; -import forge.util.Iterables; import forge.util.MyRandom; /** diff --git a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java index ef0cdf05a17..e8cda84e416 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java @@ -9,16 +9,11 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import com.google.common.collect.*; import forge.gui.control.PlaybackSpeed; import forge.trackable.TrackableCollection; -import forge.util.Iterables; import org.apache.commons.lang3.StringUtils; -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 forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java index adc75fa0ac1..fce32159c0e 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java @@ -2,6 +2,7 @@ package forge.gamemodes.match.input; import java.util.Collection; +import com.google.common.collect.Iterables; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardView; @@ -11,7 +12,6 @@ import forge.game.spellability.SpellAbility; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; import forge.player.PlayerControllerHuman; -import forge.util.Iterables; public abstract class InputSelectManyBase extends InputSyncronizedBase { private static final long serialVersionUID = -2305549394512889450L; diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java index 0dce64c767a..a27a8f613f3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; +import com.google.common.collect.Iterables; import org.apache.commons.lang3.ObjectUtils; import com.google.common.collect.Lists; diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java index 76a87677526..ee723815ecf 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.Map; import java.util.TreeMap; -import forge.util.Iterables; +import com.google.common.collect.Iterables; import org.apache.commons.lang3.StringUtils; import forge.StaticData; diff --git a/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java b/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java index cbb78bfc42b..d212d9267dd 100644 --- a/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java +++ b/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.function.Function; -import forge.util.Iterables; +import com.google.common.collect.Iterables; import org.apache.commons.lang3.StringUtils; import forge.gui.GuiBase; diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 29f8e48abc5..c63cab28d4e 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -1,5 +1,6 @@ package forge.player; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.card.CardType; import forge.card.MagicColor; diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index f32dca1faef..3db1d43a8cc 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.google.common.collect.Iterables; import forge.ImageKeys; import forge.game.ability.AbilityKey; import forge.game.cost.*; @@ -41,7 +42,6 @@ import forge.gamemodes.match.input.InputSelectCardsFromList; import forge.gui.FThreads; import forge.gui.util.SGuiChoose; import forge.util.Aggregates; -import forge.util.Iterables; import forge.util.Localizer; import forge.util.TextUtil; import forge.util.collect.FCollectionView; @@ -195,7 +195,8 @@ public class HumanPlay { // Only human player pays this way Card current = null; // Used in spells with RepeatEach effect to distinguish cards, Cut the Tethers if (sourceAbility.hasParam("ShowCurrentCard")) { - current = Iterables.getFirst(AbilityUtils.getDefinedCards(source, sourceAbility.getParam("ShowCurrentCard"), sourceAbility), null); + Iterable iterable = AbilityUtils.getDefinedCards(source, sourceAbility.getParam("ShowCurrentCard"), sourceAbility); + current = Iterables.getFirst(iterable, null); } final List parts = cost.getCostParts(); diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java index b8b339834c3..0c7ddab3310 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java +++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java @@ -19,7 +19,7 @@ package forge.player; import java.util.Collections; -import forge.util.Iterables; +import com.google.common.collect.Iterables; import org.apache.commons.lang3.StringUtils; import forge.card.CardType; diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 0e4488fd443..9df50619d37 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -62,7 +62,6 @@ import forge.localinstance.properties.ForgePreferences.FPref; import forge.model.FModel; import forge.trackable.TrackableCollection; import forge.util.*; -import forge.util.Iterables; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; import io.sentry.Sentry;