From cf68a75c03f62833aacfe34195576fc7e8b0326b Mon Sep 17 00:00:00 2001 From: Jetz Date: Sun, 8 Sep 2024 15:29:41 -0400 Subject: [PATCH] Guava migration - Inline `Iterables.all` (Collection overload) --- forge-core/src/main/java/forge/util/Iterables.java | 3 --- .../forge/localinstance/achievements/AgainstAllOdds.java | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/forge-core/src/main/java/forge/util/Iterables.java b/forge-core/src/main/java/forge/util/Iterables.java index 8d34ca4bd7a..6f86363025d 100644 --- a/forge-core/src/main/java/forge/util/Iterables.java +++ b/forge-core/src/main/java/forge/util/Iterables.java @@ -66,9 +66,6 @@ public class Iterables { public static Iterable filter(Collection iterable, Predicate filter) { return () -> iterable.stream().filter(filter).iterator(); } - public static boolean all(Collection iterable, Predicate test) { - return iterable.stream().allMatch(test); - } public static int size(Collection collection) { diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/AgainstAllOdds.java b/forge-gui/src/main/java/forge/localinstance/achievements/AgainstAllOdds.java index 530602980b9..00de95c14a3 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/AgainstAllOdds.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AgainstAllOdds.java @@ -4,7 +4,6 @@ import forge.game.Game; import forge.game.player.Player; import forge.game.player.PlayerCollection; import forge.game.player.PlayerPredicates; -import forge.util.Iterables; import forge.util.Localizer; public class AgainstAllOdds extends Achievement { @@ -25,9 +24,9 @@ public class AgainstAllOdds extends Achievement { for (Player opp : player.getRegisteredOpponents()) { PlayerCollection otherOpps = player.getRegisteredOpponents(); otherOpps.remove(opp); - if (Iterables.all(otherOpps, PlayerPredicates.sameTeam(opp))) { + if (otherOpps.stream().allMatch(PlayerPredicates.sameTeam(opp))) { teamNum++; - } else if (Iterables.all(otherOpps, PlayerPredicates.sameTeam(opp).negate())) { + } else if (otherOpps.stream().allMatch(PlayerPredicates.sameTeam(opp).negate())) { teamNum--; } }