From efe55efa435091f3fe6e098dcef1393e8fe75262 Mon Sep 17 00:00:00 2001
From: Jetz <Jetz722@gmail.com>
Date: Fri, 6 Sep 2024 19:55:57 -0400
Subject: [PATCH] Guava migration - Inline `Iterables.isEmpty` (Collection
 overload)

---
 forge-ai/src/main/java/forge/ai/ability/UntapAi.java          | 4 ++--
 forge-core/src/main/java/forge/util/Iterables.java            | 3 ---
 .../java/forge/game/event/GameEventPlayerStatsChanged.java    | 3 +--
 forge-gui-mobile/src/forge/screens/match/MatchController.java | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/UntapAi.java b/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
index 6f98186da85..8366a2d6df8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
@@ -21,8 +21,8 @@ import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
-import forge.util.Iterables;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -319,7 +319,7 @@ public class UntapAi extends SpellAbilityAi {
     @Override
     public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable<Card> list, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
         CardCollection pref = CardLists.filterControlledBy(list, ai.getYourTeam());
-        if (Iterables.isEmpty(pref)) {
+        if (pref.isEmpty()) {
             if (isOptional) {
                 return null;
             }
diff --git a/forge-core/src/main/java/forge/util/Iterables.java b/forge-core/src/main/java/forge/util/Iterables.java
index acc6fc365c7..c3e85351072 100644
--- a/forge-core/src/main/java/forge/util/Iterables.java
+++ b/forge-core/src/main/java/forge/util/Iterables.java
@@ -113,9 +113,6 @@ public class Iterables {
     public static <T> T getLast(List<? extends T> iterable, T defaultValue) {
         return iterable.isEmpty() ? defaultValue : iterable.get(iterable.size() - 1);
     }
-    public static boolean isEmpty(Collection<?> iterable) {
-        return iterable.isEmpty();
-    }
 
     //TODO: Restore everything below
     public static <T> Iterable<T> unmodifiableIterable(final Iterable<? extends T> iterable) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
index de03c752a2c..b077517cc24 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.Collection;
 
 import forge.game.player.Player;
-import forge.util.Iterables;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
@@ -36,7 +35,7 @@ public class GameEventPlayerStatsChanged extends GameEvent {
 
     @Override
     public String toString() {
-        if (null == players || Iterables.isEmpty(players)) {
+        if (null == players || players.isEmpty()) {
             return "Player state changes: (empty list)";
         }
         return TextUtil.concatWithSpace("Player state changes:", Lang.joinHomogenous(players));
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index ed63a73b1bb..46cc4aa7956 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -12,7 +12,6 @@ import forge.ai.GameState;
 import forge.deck.Deck;
 import forge.game.player.Player;
 import forge.item.IPaperCard;
-import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import org.apache.commons.lang3.StringUtils;
 
@@ -680,7 +679,7 @@ public class MatchController extends AbstractGuiGame {
 
     @Override
     public GameEntityView chooseSingleEntityForEffect(final String title, final List<? extends GameEntityView> optionList, final DelayedReveal delayedReveal, final boolean isOptional) {
-        if (delayedReveal == null || Iterables.isEmpty(delayedReveal.getCards())) {
+        if (delayedReveal == null || delayedReveal.getCards().isEmpty()) {
             if (isOptional) {
                 return SGuiChoose.oneOrNone(title, optionList);
             }