diff --git a/adventure-editor/src/main/java/forge/adventure/editor/QuestController.java b/adventure-editor/src/main/java/forge/adventure/editor/QuestController.java index ba029fac853..00e35bdaa31 100644 --- a/adventure-editor/src/main/java/forge/adventure/editor/QuestController.java +++ b/adventure-editor/src/main/java/forge/adventure/editor/QuestController.java @@ -13,6 +13,7 @@ import forge.adventure.util.Paths; import javax.swing.*; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public class QuestController { @@ -50,7 +51,7 @@ public class QuestController { toReturn.addElement(enemyTags.get(i)); } - List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList(); + List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList()); toReturn.clear(); @@ -68,7 +69,7 @@ public class QuestController { toReturn.addElement(POITags.get(i)); } - List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList(); + List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList()); toReturn.clear(); @@ -88,7 +89,7 @@ public class QuestController { toReturn.addElement(questSourceTags.get(i)); } - List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList(); + List sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList()); toReturn.clear(); diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java index a0d503716d2..d7894cf612e 100644 --- a/forge-core/src/main/java/forge/card/CardDb.java +++ b/forge-core/src/main/java/forge/card/CardDb.java @@ -283,7 +283,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { if (cr.hasFunctionalVariants()) { cardsInSet = cardsInSet.stream().filter(c -> StringUtils.isEmpty(c.functionalVariantName) || cr.getSupportedFunctionalVariants().contains(c.functionalVariantName) - ).toList(); + ).collect(Collectors.toList()); } if (cardsInSet.isEmpty()) return false; diff --git a/forge-game/src/main/java/forge/game/card/TokenCreateTable.java b/forge-game/src/main/java/forge/game/card/TokenCreateTable.java index ec7abf45392..64b84ff5981 100644 --- a/forge-game/src/main/java/forge/game/card/TokenCreateTable.java +++ b/forge-game/src/main/java/forge/game/card/TokenCreateTable.java @@ -12,6 +12,7 @@ import org.apache.commons.lang3.ObjectUtils; import java.util.List; import java.util.Map; import java.util.function.Predicate; +import java.util.stream.Collectors; public class TokenCreateTable extends ForwardingTable { @@ -47,7 +48,7 @@ public class TokenCreateTable extends ForwardingTable { if (validOwner != null) { Predicate restriction = GameObjectPredicates.restriction(validOwner.split(","), host.getController(), host, ctb); - filteredPlayer = rowKeySet().stream().filter(restriction).toList(); + filteredPlayer = rowKeySet().stream().filter(restriction).collect(Collectors.toList()); if (filteredPlayer.isEmpty()) { return 0; } diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java index 669416668c4..b8ad177eef1 100644 --- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java +++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java @@ -447,7 +447,7 @@ public class EnemySprite extends CharacterSprite implements Steerable { if (Current.latestDeck() != null) { List paperCardList = Current.latestDeck().getMain().toFlatList().stream() .filter(paperCard -> !paperCard.isVeryBasicLand() && !paperCard.getName().startsWith("Mox")) - .toList(); + .collect(Collectors.toList()); //random uncommons from deck List uncommonCards = paperCardList.stream() .filter(paperCard -> CardRarity.Uncommon.equals(paperCard.getRarity()) || CardRarity.Special.equals(paperCard.getRarity())) diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java index 9ad10a22358..3afbae2914b 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java @@ -12,6 +12,7 @@ import forge.util.Aggregates; import java.io.Serializable; import java.util.*; +import java.util.stream.Collectors; import static forge.adventure.util.AdventureQuestController.ObjectiveTypes.*; import static forge.adventure.util.AdventureQuestController.QuestStatus.*; @@ -165,7 +166,7 @@ public class AdventureQuestStage implements Serializable { return worldMapOK; } if (targetPOI == null) { - List enteredTags = Arrays.stream(locationToCheck.getData().questTags).toList(); + List enteredTags = Arrays.stream(locationToCheck.getData().questTags).collect(Collectors.toList()); for (String tag : POITags) { if (!enteredTags.contains(tag)) { return false; diff --git a/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java b/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java index 1cde9ffd3c5..ed19393732f 100644 --- a/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java +++ b/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java @@ -18,6 +18,7 @@ import forge.util.Aggregates; import java.io.Serializable; import java.time.LocalDate; import java.util.*; +import java.util.stream.Collectors; import static forge.adventure.util.AdventureQuestController.QuestStatus.*; @@ -39,7 +40,7 @@ public class AdventureQuestController implements Serializable { continue; } for (EnemyData enemy : WorldData.getAllEnemies()) { - List candidateTags = Arrays.stream(enemy.questTags).toList(); + List candidateTags = Arrays.stream(enemy.questTags).collect(Collectors.toList()); boolean match = true; for (String targetTag : c.enemyTags) { if (!candidateTags.contains(targetTag)) { @@ -72,7 +73,7 @@ public class AdventureQuestController implements Serializable { List toBoost = new ArrayList<>(); if (c.mixedEnemies){ for (EnemyData enemy : localSpawns){ - List candidateTags = Arrays.stream(enemy.questTags).toList(); + List candidateTags = Arrays.stream(enemy.questTags).collect(Collectors.toList()); boolean match = true; for (String targetTag : c.enemyTags) { if (!candidateTags.contains(targetTag)) { diff --git a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java index 07ed4981c6b..f1e87bb344d 100644 --- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java +++ b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java @@ -27,6 +27,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Predicate; import java.util.regex.Pattern; +import java.util.stream.Collectors; import static forge.adventure.data.RewardData.generateAllCards; @@ -819,7 +820,7 @@ public class CardUtil { ? FModel.getMagicDb().getCommonCards().getAllCards(cardName) : FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(cardName); List validCards = cardPool.stream() - .filter(input -> input.getEdition().equals(edition)).toList(); + .filter(input -> input.getEdition().equals(edition)).collect(Collectors.toList()); if (validCards.isEmpty()) { System.err.println("Unexpected behavior: tried to call getCardByNameAndEdition for card " + cardName + " from the edition " + edition + ", but didn't find it in the DB. A random existing instance will be returned."); diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java index 0ef0ecaa380..a32f1a21bf7 100644 --- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java @@ -147,7 +147,7 @@ public final class CardRelationMatrixGenerator { } //filter to just legal commanders - List legends = cardList.stream().filter(format.isLegalCommanderPredicate()).toList(); + List legends = cardList.stream().filter(format.isLegalCommanderPredicate()).collect(Collectors.toList()); //generate lookups for legends to link commander names to matrix rows for (int i=0; i keyCardList = aiPlayables.stream() .filter(PaperCardPredicates.name(secondKeyCard.getName())) - .toList(); + .collect(Collectors.toList()); deckList.addAll(keyCardList); aiPlayables.removeAll(keyCardList); rankedColorList.removeAll(keyCardList); @@ -418,7 +418,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { if(secondKeyCard!=null && secondKeyCard.getRules().getMainPart().getType().isLand()) { final List keyCardList = aiPlayables.stream() .filter(PaperCardPredicates.name(secondKeyCard.getName())) - .toList(); + .collect(Collectors.toList()); deckList.addAll(keyCardList); aiPlayables.removeAll(keyCardList); rankedColorList.removeAll(keyCardList); @@ -443,7 +443,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { * If evolving wilds is in the deck and there are fewer than 4 spaces for basic lands - remove evolving wilds */ protected void checkEvolvingWilds(){ - List evolvingWilds = deckList.stream().filter(PaperCardPredicates.name("Evolving Wilds")).toList(); + List evolvingWilds = deckList.stream().filter(PaperCardPredicates.name("Evolving Wilds")).collect(Collectors.toList()); if((evolvingWilds.size()>0 && landsNeeded<4 ) || colors.countColors()<2){ deckList.removeAll(evolvingWilds); landsNeeded=landsNeeded+evolvingWilds.size(); diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java index 6ed888183e4..c5fc3c3a899 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java @@ -33,6 +33,7 @@ import forge.util.storage.IStorage; import org.apache.commons.lang3.tuple.ImmutablePair; import java.util.*; +import java.util.stream.Collectors; /** * This is a helper class for unlocking new sets during a format-limited @@ -139,12 +140,12 @@ public class QuestUtilUnlockSets { // Sort current sets by date List allowedSets = qData.getFormat().getAllowedSetCodes().stream() .map(editions::get) - .sorted().toList(); + .sorted().collect(Collectors.toList()); // Sort unlockable sets by date List excludedSets = qData.getFormat().getLockedSets().stream() .map(editions::get) - .sorted().toList(); + .sorted().collect(Collectors.toList()); // get a number of sets between an excluded and any included set List> excludedWithDistances = new ArrayList<>(); diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index cff4a28c35f..bbad8fa0a50 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1885,7 +1885,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont if (possibleReplacers.size() == 1) { return first; } - final List res = possibleReplacers.stream().map(ReplacementEffect::toString).toList(); + final List res = possibleReplacers.stream().map(ReplacementEffect::toString).collect(Collectors.toList()); final String firstStr = res.get(0); final String prompt = localizer.getMessage("lblChooseFirstApplyReplacementEffect"); for (int i = 1; i < res.size(); i++) { @@ -1907,7 +1907,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont if (possibleStatics.size() == 1 || !fullControl) { return first; } - final List sts = possibleStatics.stream().map(StaticAbility::toString).toList(); + final List sts = possibleStatics.stream().map(StaticAbility::toString).collect(Collectors.toList()); final String firstStr = sts.get(0); for (int i = 1; i < sts.size(); i++) { // prompt user if there are multiple different options diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java index 67c82ccba9a..50d0b688af2 100644 --- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java +++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java @@ -304,7 +304,7 @@ public final class LDAModelGenetrator { //filter to just legal commanders List legends = cardList.stream() .filter(PaperCardPredicates.fromRules(DeckFormat.Commander::isLegalCommander)) - .toList(); + .collect(Collectors.toList()); //generate lookups for legends to link commander names to matrix rows for (int i=0; i