From f636910ebbb4a1b813be7f92ea4c0a99b8a83cda Mon Sep 17 00:00:00 2001 From: Jetz Date: Wed, 25 Sep 2024 09:01:46 -0400 Subject: [PATCH] Guava migration - Rename `StreamUtils` -> `StreamUtil` for consistency --- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 2 +- .../java/forge/deck/generation/DeckGeneratorBase.java | 2 +- forge-core/src/main/java/forge/item/SealedProduct.java | 4 ++-- .../forge/util/{StreamUtils.java => StreamUtil.java} | 4 ++-- .../game/ability/effects/ChooseCardNameEffect.java | 2 +- .../java/forge/game/ability/effects/PlayEffect.java | 2 +- .../forge/screens/deckeditor/controllers/CDeckgen.java | 4 ++-- forge-gui/src/main/java/forge/deck/DeckgenUtil.java | 6 +++--- .../java/forge/gamemodes/quest/QuestUtilCards.java | 10 +++++----- 9 files changed, 18 insertions(+), 18 deletions(-) rename forge-core/src/main/java/forge/util/{StreamUtils.java => StreamUtil.java} (98%) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index 70b59bfba78..aceccc32aab 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -2452,7 +2452,7 @@ public class ComputerUtil { if (minDiff > 0) { List choices = validCards.stream() .filter(((Predicate) goodChoices::contains).negate()) - .collect(StreamUtils.random(minDiff)); + .collect(StreamUtil.random(minDiff)); goodChoices.addAll(choices); return goodChoices; } diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index 99d93a14fec..95a51c22ca2 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -238,7 +238,7 @@ public abstract class DeckGeneratorBase { for (int i = 0; i < 3 && actualSize > targetSize; i++) { List toRemove = tDeck.toFlatList().stream() .filter(PaperCardPredicates.NOT_BASIC_LAND) - .collect(StreamUtils.random(actualSize - targetSize)); + .collect(StreamUtil.random(actualSize - targetSize)); tDeck.removeAllFlat(toRemove); for (PaperCard c : toRemove) { diff --git a/forge-core/src/main/java/forge/item/SealedProduct.java b/forge-core/src/main/java/forge/item/SealedProduct.java index 19b58de9ddb..bf68e1dcbfc 100644 --- a/forge-core/src/main/java/forge/item/SealedProduct.java +++ b/forge-core/src/main/java/forge/item/SealedProduct.java @@ -20,7 +20,7 @@ package forge.item; import forge.StaticData; import forge.item.generation.BoosterGenerator; -import forge.util.StreamUtils; +import forge.util.StreamUtil; import java.util.ArrayList; import java.util.List; @@ -112,6 +112,6 @@ public abstract class SealedProduct implements InventoryItemFromSet { return StaticData.instance().getCommonCards().streamAllCards() .filter(PaperCardPredicates.printedInSet(setCode)) .filter(PaperCardPredicates.IS_BASIC_LAND) - .collect(StreamUtils.random(count)); + .collect(StreamUtil.random(count)); } } diff --git a/forge-core/src/main/java/forge/util/StreamUtils.java b/forge-core/src/main/java/forge/util/StreamUtil.java similarity index 98% rename from forge-core/src/main/java/forge/util/StreamUtils.java rename to forge-core/src/main/java/forge/util/StreamUtil.java index f112ba1b3f5..c53a41cb239 100644 --- a/forge-core/src/main/java/forge/util/StreamUtils.java +++ b/forge-core/src/main/java/forge/util/StreamUtil.java @@ -5,9 +5,9 @@ import java.util.function.*; import java.util.stream.Collector; import java.util.stream.Stream; -public class StreamUtils { +public class StreamUtil { - private StreamUtils(){} + private StreamUtil(){} /** * Reduces a stream to a random element of the stream. Used with {@link Stream#collect}. diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java index 866a5e8f8ff..6d69708fce7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java @@ -132,7 +132,7 @@ public class ChooseCardNameEffect extends SpellAbilityEffect { } if (randomChoice) { chosen = StaticData.instance().getCommonCards().streamAllFaces() - .filter(cpp).collect(StreamUtils.random()).get() + .filter(cpp).collect(StreamUtil.random()).get() .getName(); } else { chosen = p.getController().chooseCardName(sa, cpp, valid, message); diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java index 790cb14caf3..22da1e33deb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java @@ -130,7 +130,7 @@ public class PlayEffect extends SpellAbilityEffect { final CardCollection choice = new CardCollection(); final String num = sa.getParamOrDefault("RandomNum", "1"); int nCopied = AbilityUtils.calculateAmount(source, num, sa); - for (PaperCard cp : cards.collect(StreamUtils.random(nCopied))) { + for (PaperCard cp : cards.collect(StreamUtil.random(nCopied))) { final Card possibleCard = Card.fromPaperCard(cp, sa.getActivatingPlayer()); if (sa.getActivatingPlayer().isAI() && possibleCard.getRules() != null && possibleCard.getRules().getAiHints().getRemAIDecks()) continue; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java index c71c37596f9..19d9f63f93c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java @@ -21,7 +21,7 @@ import forge.model.FModel; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.SEditorIO; import forge.screens.deckeditor.views.VDeckgen; -import forge.util.StreamUtils; +import forge.util.StreamUtil; import java.util.List; @@ -70,7 +70,7 @@ public enum CDeckgen implements ICDoc { List randomCards = FModel.getMagicDb().getCommonCards().streamUniqueCards() .filter(PaperCardPredicates.NOT_BASIC_LAND) - .collect(StreamUtils.random(15 * 5)); + .collect(StreamUtil.random(15 * 5)); randomDeck.getMain().addAllFlat(randomCards); for(final String landName : MagicColor.Constant.BASIC_LANDS) { diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java index 55b8755a87a..af7ef6bca92 100644 --- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java @@ -465,7 +465,7 @@ public class DeckgenUtil { if (!selection.isEmpty()) deck = geneticAI.stream() .filter(deckProxy -> deckProxy.getColorIdentity().sharesColorWith(ColorSet.fromNames(colors.toCharArray()))) - .collect(StreamUtils.random()).get().getDeck(); + .collect(StreamUtil.random()).get().getDeck(); else deck = Aggregates.random(geneticAI).getDeck(); @@ -474,7 +474,7 @@ public class DeckgenUtil { if (!selection.isEmpty() && selection.size() < 4) predicate = predicate.and(deckProxy -> deckProxy.getColorIdentity().hasAllColors(ColorSet.fromNames(colors.toCharArray()).getColor())); List source = isTheme ? advThemes : advPrecons; - deck = source.stream().filter(predicate).collect(StreamUtils.random()).get().getDeck(); + deck = source.stream().filter(predicate).collect(StreamUtil.random()).get().getDeck(); } } catch (Exception e) { e.printStackTrace(); @@ -659,7 +659,7 @@ public class DeckgenUtil { .filter(format.isLegalCardPredicate()) .filter(format.isLegalCommanderPredicate()) .filter(PaperCardPredicates.fromRules(canPlay)) - .collect(StreamUtils.random()).get(); + .collect(StreamUtil.random()).get(); return generateRandomCommanderDeck(commander, format, forAi, false); } diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java index b0eef4b10d5..cd3255c0a9e 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java @@ -223,7 +223,7 @@ public final class QuestUtilCards { Stream pool = getQuestCardPool(); final PaperCard card = pool .filter(applyFormatFilter(PaperCardPredicates.IS_RARE_OR_MYTHIC)) - .collect(StreamUtils.random()).get(); + .collect(StreamUtil.random()).get(); addSingleCard(card, 1); return card; @@ -239,7 +239,7 @@ public final class QuestUtilCards { */ public List addRandomCards(final int n, Predicate predicate) { Stream pool = getQuestCardPool(); - final List newCards = pool.filter(predicate).collect(StreamUtils.random(n)); + final List newCards = pool.filter(predicate).collect(StreamUtil.random(n)); addAllCards(newCards); return newCards; @@ -560,7 +560,7 @@ public final class QuestUtilCards { .filter(CardEdition.Predicates.HAS_TOURNAMENT_PACK) .filter(isLegalInQuestFormat(questController.getFormat())) .map(TournamentPack::fromSet) - .collect(StreamUtils.random(count)); + .collect(StreamUtil.random(count)); questAssets.getShopList().addAllOfTypeFlat(packs); } @@ -575,7 +575,7 @@ public final class QuestUtilCards { .filter(CardEdition.Predicates.HAS_FAT_PACK) .filter(isLegalInQuestFormat(questController.getFormat())) .map(FatPack::fromSet) - .collect(StreamUtils.random(count)); + .collect(StreamUtil.random(count)); questAssets.getShopList().addAllOfTypeFlat(packs); } @@ -625,7 +625,7 @@ public final class QuestUtilCards { } final List decks = QuestController.getPrecons().stream() .filter(formatFilter) - .collect(StreamUtils.random(count)); + .collect(StreamUtil.random(count)); questAssets.getShopList().addAllOfTypeFlat(decks); }