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

Guava migration - Inline Predicates.alwaysTrue

Browse Source
This commit is contained in:
Jetz
2024-09-02 20:00:38 -04:00
parent 16c0fa1095
commit 77ba9f1728
24 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -786,7 +786,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
List<PaperCard> cards;
Predicate<PaperCard> cardQueryFilter;
filter = (filter != null) ? filter : Predicates.alwaysTrue();
filter = filter != null ? filter : (x -> true);
if (releaseDate != null) {
cardQueryFilter = c -> {
if (c.getArtIndex() != cr.artIndex)

4
forge-core/src/main/java/forge/item/IPaperCard.java
View File

@@ -43,14 +43,14 @@ public interface IPaperCard extends InventoryItem, Serializable {
public static Predicate<PaperCard> printedInSets(final List<String> value, final boolean shouldContain) {
if ((value == null) || value.isEmpty()) {
return forge.util.Predicates.alwaysTrue();
return x -> true;
}
return new PredicateSets(value, shouldContain);
}
public static Predicate<PaperCard> printedInSet(final String value) {
if (StringUtils.isEmpty(value)) {
return forge.util.Predicates.alwaysTrue();
return x -> true;
}
return new PredicateSets(Lists.newArrayList(value), true);
}

8
forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
View File

@@ -568,7 +568,7 @@ public class BoosterGenerator {
public static PrintSheet makeSheet(String sheetKey, Iterable<PaperCard> src) {
PrintSheet ps = new PrintSheet(sheetKey);
String[] sKey = TextUtil.splitWithParenthesis(sheetKey, ' ', 2);
Predicate<PaperCard> setPred = (Predicate<PaperCard>) (sKey.length > 1 ? IPaperCard.Predicates.printedInSets(sKey[1].split(" ")) : Predicates.alwaysTrue());
Predicate<PaperCard> setPred = sKey.length > 1 ? IPaperCard.Predicates.printedInSets(sKey[1].split(" ")) : x1 -> true;
List<String> operators = new LinkedList<>(Arrays.asList(TextUtil.splitWithParenthesis(sKey[0], ':')));
Predicate<PaperCard> extraPred = buildExtraPredicate(operators);
@@ -585,7 +585,7 @@ public class BoosterGenerator {
String sheetName = StringUtils.strip(mainCode.substring(10), "()\" ");
System.out.println("Attempting to lookup: " + sheetName);
src = StaticData.instance().getPrintSheets().get(sheetName).toFlatList();
setPred = Predicates.alwaysTrue();
setPred = x -> true;
} else if (mainCode.startsWith("promo") || mainCode.startsWith("name")) { // get exactly the named cards, that's a tiny inlined print sheet
String list = StringUtils.strip(mainCode.substring(5), "() ");
@@ -597,7 +597,7 @@ public class BoosterGenerator {
}
src = srcList;
setPred = Predicates.alwaysTrue();
setPred = x -> true;
} else {
continue;
}
@@ -732,7 +732,7 @@ public class BoosterGenerator {
}
if (conditions.isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return Predicates.and(conditions);

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

@@ -24,9 +24,7 @@ public class Predicates {
//TODO: Inline everything below.
public static <T> Predicate<T> alwaysTrue() {
return x -> true;
}
public static <T> Predicate<T> not(Predicate<T> predicate) {
return predicate.negate();
}

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

@@ -112,7 +112,7 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
}
} else {
// use CardFace because you might name a alternate names
Predicate<ICardFace> cpp = Predicates.alwaysTrue();
Predicate<ICardFace> cpp = x -> true;
if (sa.hasParam("ValidCards")) {
//Calculating/replacing this must happen before running valid in CardFacePredicates
if (valid.contains("cmcEQ") && !StringUtils.isNumeric(valid.split("cmcEQ")[1])) {

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -212,7 +212,7 @@ public class CardFactoryUtil {
public static boolean handleHiddenAgenda(Player player, Card card) {
SpellAbility sa = new SpellAbility.EmptySa(card);
sa.putParam("AILogic", card.getSVar("AgendaLogic"));
Predicate<ICardFace> cpp = Predicates.alwaysTrue();
Predicate<ICardFace> cpp = x -> true;
//Predicate<Card> pc = Predicates.in(player.getAllCards());
// TODO This would be better to send in the player's deck, not all cards
String name = player.getController().chooseCardName(sa, cpp, "Card",

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

@@ -18,16 +18,16 @@ public enum AttackRestrictionType {
public Predicate<Card> getPredicate(final Card attacker) {
switch (this) {
case NEED_GREATER_POWER:
return CardPredicates.hasGreaterPowerThan(attacker.getNetPower());
case NEED_BLACK_OR_GREEN:
return Predicates.and(
CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)),
// may explicitly not be black/green itself
Predicates.not(Predicates.equalTo(attacker)));
case NOT_ALONE:
return Predicates.alwaysTrue();
default:
case NEED_GREATER_POWER:
return CardPredicates.hasGreaterPowerThan(attacker.getNetPower());
case NEED_BLACK_OR_GREEN:
return Predicates.and(
CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)),
// may explicitly not be black/green itself
Predicates.not(Predicates.equalTo(attacker)));
case NOT_ALONE:
return x -> true;
default:
}
return null;
}

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java
View File

@@ -31,7 +31,7 @@ public class CardCMCRangeFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.CMC);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
return Predicates.compose(predicate, PaperCard::getRules);
}

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java
View File

@@ -31,7 +31,7 @@ public class CardPowerFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.POWER);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java
View File

@@ -31,7 +31,7 @@ public class CardToughnessFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.TOUGHNESS);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

3
forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -14,7 +14,6 @@ import forge.itemmanager.SFilterUtil;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import forge.util.Predicates;
public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
@@ -113,7 +112,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
protected Predicate<T> buildPredicate() {
String text = txtSearch.getText();
if (text.trim().isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return SFilterUtil.buildItemTextFilter(text);
}

2
forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java
View File

@@ -28,7 +28,7 @@ public class CardCMCFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.CMC);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
return Predicates.compose(predicate, PaperCard::getRules);
}

2
forge-gui-mobile/src/forge/itemmanager/filters/CardColorlessCostFilter.java
View File

@@ -28,7 +28,7 @@ public class CardColorlessCostFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.GENERIC_COST);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
return Predicates.compose(predicate, PaperCard::getRules);
}

3
forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java
View File

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.util.Predicates;
import java.util.function.Predicate;
@@ -22,7 +21,7 @@ public class CardFormatFilter extends FormatFilter<PaperCard> {
@Override
protected final Predicate<PaperCard> buildPredicate() {
if (format == null) {
return Predicates.alwaysTrue();
return x -> true;
}
if (format.getName() == null) {
return format.getFilterPrinted(); //if format is collection of sets, don't show reprints in other sets

2
forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java
View File

@@ -28,7 +28,7 @@ public class CardPowerFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.POWER);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

2
forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java
View File

@@ -28,7 +28,7 @@ public class CardToughnessFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.TOUGHNESS);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

3
forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java
View File

@@ -2,7 +2,6 @@ package forge.itemmanager.filters;
import forge.deck.DeckProxy;
import forge.itemmanager.ItemManager;
import forge.util.Predicates;
import java.util.function.Predicate;
@@ -22,7 +21,7 @@ public class DeckFormatFilter extends FormatFilter<DeckProxy> {
@Override
protected final Predicate<DeckProxy> buildPredicate() {
if (format == null) {
return Predicates.alwaysTrue();
return x -> true;
}
return input -> format.isDeckLegal(input.getDeck());
}

3
forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -10,7 +10,6 @@ import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FTextField;
import forge.util.Predicates;
import java.util.function.Predicate;
@@ -63,7 +62,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
protected Predicate<T> buildPredicate() {
String text = txtSearch.getText();
if (text.trim().isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return SFilterUtil.buildItemTextFilter(text);
}

2
forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
View File

@@ -278,7 +278,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
addLandKeyCards();
// 8. Add non-basic lands
List<String> duals = getDualLandList(isForAI ? CardRulesPredicates.IS_KEPT_IN_AI_DECKS : Predicates.alwaysTrue());
List<String> duals = getDualLandList(isForAI ? CardRulesPredicates.IS_KEPT_IN_AI_DECKS : x -> true);
addNonBasicLands();
if (logToConsole) {
System.out.println("Post Nonbasic lands : " + deckList.size());

2
forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
View File

@@ -106,7 +106,7 @@ public class ConquestRegion {
String name = null;
String artCardName = null;
ColorSet colorSet = ColorSet.ALL_COLORS;
Predicate<PaperCard> pred = Predicates.alwaysTrue();
Predicate<PaperCard> pred = x -> true;
String key, value;
String[] pieces = line.split("\\|");

2
forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java
View File

@@ -126,7 +126,7 @@ public final class BoosterUtils {
}
Predicate<PaperCard> filter = Predicates.alwaysTrue();
Predicate<PaperCard> filter = x -> true;
if (formatStartingPool != null) {
filter = formatStartingPool.getFilterPrinted();
}

2
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -1538,7 +1538,7 @@ public class AdvancedSearch {
public Predicate<T> getPredicate() {
if (isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return getPredicatePiece(new ExpressionIterator());
}

2
forge-gui/src/main/java/forge/itemmanager/BooleanExpression.java
View File

@@ -162,7 +162,7 @@ public class BooleanExpression {
if (!predicates.isEmpty()) {
return Predicates.or(predicates);
}
return Predicates.alwaysTrue();
return x -> true;
}

4
forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
View File

@@ -41,7 +41,7 @@ public class SFilterUtil {
text = text.trim();
if (text.isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
if (BooleanExpression.isExpression(text)) {
@@ -117,7 +117,7 @@ public class SFilterUtil {
public static <T extends InventoryItem> Predicate<T> buildItemTextFilter(String text) {
if (text.trim().isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return new ItemTextPredicate<>(text);