From 6b96bca83f7d4b3b5ce40316b9e3dece734d79f6 Mon Sep 17 00:00:00 2001
From: Jetz <Jetz722@gmail.com>
Date: Tue, 3 Sep 2024 08:54:18 -0400
Subject: [PATCH] Guava migration - Inline `Predicates.equalTo`

---
 forge-core/src/main/java/forge/util/Predicates.java         | 6 ------
 .../java/forge/game/ability/effects/ChangeZoneEffect.java   | 2 +-
 .../src/main/java/forge/game/combat/AttackConstraints.java  | 2 +-
 .../main/java/forge/game/combat/AttackRestrictionType.java  | 2 +-
 .../main/java/forge/game/trigger/TriggerChangesZone.java    | 5 +++--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/forge-core/src/main/java/forge/util/Predicates.java b/forge-core/src/main/java/forge/util/Predicates.java
index 563d646e702..3547e218b06 100644
--- a/forge-core/src/main/java/forge/util/Predicates.java
+++ b/forge-core/src/main/java/forge/util/Predicates.java
@@ -37,10 +37,4 @@ public class Predicates {
         //TODO: remove casting?
         return ((Predicate<T>) first).or(second);
     }
-
-    //TODO: This one probably needs case by case; nullable targets need a safe test, whereas nonnull targets can be simplified further.
-    public static <T> Predicate<T> equalTo(T target) {
-        return x -> Objects.equals(target, x);
-    }
-
 }
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 ec0cea46178..632eca87f21 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
@@ -1150,7 +1150,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     }
                     if (sa.hasParam("DifferentPower")) {
                         for (Card c : chosenCards) {
-                            fetchList = CardLists.filter(fetchList, Predicates.not(Predicates.compose(Predicates.equalTo(c.getNetPower()), Card::getNetPower)));
+                            fetchList = CardLists.filter(fetchList, Predicates.not(Predicates.compose(x -> x == c.getNetPower(), Card::getNetPower)));
                         }
                     }
                     if (sa.hasParam("ShareLandType")) {
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 d9b8ca5a6b9..2f5e50d54cd 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
@@ -399,7 +399,7 @@ public class AttackConstraints {
         return null;
     }
     private static Attack findFirst(final List<Attack> reqs, final Card attacker) {
-        return findFirst(reqs, Predicates.equalTo(attacker));
+        return findFirst(reqs, attacker::equals);
     }
     private static Collection<Attack> findAll(final List<Attack> reqs, final Card attacker) {
         return Collections2.filter(reqs, input -> input.attacker.equals(attacker));
diff --git a/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java b/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java
index 9cfd08e7ecf..a06366f44c9 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java
@@ -24,7 +24,7 @@ public enum AttackRestrictionType {
                 return Predicates.and(
                         CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)),
                         // may explicitly not be black/green itself
-                        Predicates.not(Predicates.equalTo(attacker)));
+                        Predicates.not(attacker::equals));
             case NOT_ALONE:
                 return x -> true;
             default:
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
index ee25671db5f..5322c90f8e0 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -20,9 +20,9 @@ package forge.game.trigger;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import forge.util.Iterables;
-import forge.util.Predicates;
 import org.apache.commons.lang3.ArrayUtils;
 
 import com.google.common.collect.Sets;
@@ -185,7 +185,8 @@ public class TriggerChangesZone extends Trigger {
             thisTurnCast = CardLists.filterControlledByAsList(thisTurnCast, getHostCard().getController());
 
             // checks which card this spell was the castSA
-            int left = Iterables.indexOf(thisTurnCast, CardPredicates.castSA(Predicates.equalTo(getHostCard().getCastSA())));
+            SpellAbility castSA = getHostCard().getCastSA();
+            int left = Iterables.indexOf(thisTurnCast, CardPredicates.castSA(x -> Objects.equals(castSA, x)));
             int right = Integer.parseInt(compare.substring(2));
             if (!Expressions.compare(left + 1, compare, right)) {
                 return false;