external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guava migration - Inline Predicates.equalTo

Browse Source
This commit is contained in:
Jetz
2024-09-03 08:54:18 -04:00
parent 4eb8fddfef
commit 6b96bca83f
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/util/Predicates.java
View File

@@ -37,10 +37,4 @@ public class Predicates {
//TODO: remove casting? //TODO: remove casting?
return ((Predicate<T>) first).or(second); 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);
}
} }

2
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -1150,7 +1150,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
if (sa.hasParam("DifferentPower")) { if (sa.hasParam("DifferentPower")) {
for (Card c : chosenCards) { 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")) { if (sa.hasParam("ShareLandType")) {

2
forge-game/src/main/java/forge/game/combat/AttackConstraints.java
View File

@@ -399,7 +399,7 @@ public class AttackConstraints {
return null; return null;
} }
private static Attack findFirst(final List<Attack> reqs, final Card attacker) { 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) { private static Collection<Attack> findAll(final List<Attack> reqs, final Card attacker) {
return Collections2.filter(reqs, input -> input.attacker.equals(attacker)); return Collections2.filter(reqs, input -> input.attacker.equals(attacker));

2
forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java
View File

@@ -24,7 +24,7 @@ public enum AttackRestrictionType {
return Predicates.and( return Predicates.and(
CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)), CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)),
// may explicitly not be black/green itself // may explicitly not be black/green itself
Predicates.not(Predicates.equalTo(attacker))); Predicates.not(attacker::equals));
case NOT_ALONE: case NOT_ALONE:
return x -> true; return x -> true;
default: default:

5
forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
View File

@@ -20,9 +20,9 @@ package forge.game.trigger;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import forge.util.Iterables; import forge.util.Iterables;
import forge.util.Predicates;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@@ -185,7 +185,8 @@ public class TriggerChangesZone extends Trigger {
thisTurnCast = CardLists.filterControlledByAsList(thisTurnCast, getHostCard().getController()); thisTurnCast = CardLists.filterControlledByAsList(thisTurnCast, getHostCard().getController());
// checks which card this spell was the castSA // 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)); int right = Integer.parseInt(compare.substring(2));
if (!Expressions.compare(left + 1, compare, right)) { if (!Expressions.compare(left + 1, compare, right)) {
return false; return false;