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

Revert .toList() for Android compatibility

Browse Source
This commit is contained in:
Jetz
2024-11-13 09:17:33 -05:00
parent 2b5fc37232
commit d81c5a40cf
12 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adventure-editor/src/main/java/forge/adventure/editor/QuestController.java
View File

@@ -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<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList();
List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
toReturn.clear();
@@ -68,7 +69,7 @@ public class QuestController {
toReturn.addElement(POITags.get(i));
}
List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList();
List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
toReturn.clear();
@@ -88,7 +89,7 @@ public class QuestController {
toReturn.addElement(questSourceTags.get(i));
}
List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().toList();
List<Object> sortedObjects = Arrays.stream(toReturn.toArray()).sorted().collect(Collectors.toList());
toReturn.clear();

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

@@ -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;

3
forge-game/src/main/java/forge/game/card/TokenCreateTable.java
View File

@@ -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<Player, Card, Integer> {
@@ -47,7 +48,7 @@ public class TokenCreateTable extends ForwardingTable<Player, Card, Integer> {
if (validOwner != null) {
Predicate<GameObject> 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;
}

2
forge-gui-mobile/src/forge/adventure/character/EnemySprite.java
View File

@@ -447,7 +447,7 @@ public class EnemySprite extends CharacterSprite implements Steerable<Vector2> {
if (Current.latestDeck() != null) {
List<PaperCard> paperCardList = Current.latestDeck().getMain().toFlatList().stream()
.filter(paperCard -> !paperCard.isVeryBasicLand() && !paperCard.getName().startsWith("Mox"))
.toList();
.collect(Collectors.toList());
//random uncommons from deck
List<PaperCard> uncommonCards = paperCardList.stream()
.filter(paperCard -> CardRarity.Uncommon.equals(paperCard.getRarity()) || CardRarity.Special.equals(paperCard.getRarity()))

3
forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java
View File

@@ -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<String> enteredTags = Arrays.stream(locationToCheck.getData().questTags).toList();
List<String> enteredTags = Arrays.stream(locationToCheck.getData().questTags).collect(Collectors.toList());
for (String tag : POITags) {
if (!enteredTags.contains(tag)) {
return false;

5
forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java
View File

@@ -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<String> candidateTags = Arrays.stream(enemy.questTags).toList();
List<String> 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<String> toBoost = new ArrayList<>();
if (c.mixedEnemies){
for (EnemyData enemy : localSpawns){
List<String> candidateTags = Arrays.stream(enemy.questTags).toList();
List<String> candidateTags = Arrays.stream(enemy.questTags).collect(Collectors.toList());
boolean match = true;
for (String targetTag : c.enemyTags) {
if (!candidateTags.contains(targetTag)) {

3
forge-gui-mobile/src/forge/adventure/util/CardUtil.java
View File

@@ -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<PaperCard> 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.");

2
forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
View File

@@ -147,7 +147,7 @@ public final class CardRelationMatrixGenerator {
}
//filter to just legal commanders
List<PaperCard> legends = cardList.stream().filter(format.isLegalCommanderPredicate()).toList();
List<PaperCard> 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<legends.size(); ++i){

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

@@ -397,7 +397,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
if(secondKeyCard!=null && !secondKeyCard.getRules().getMainPart().getType().isLand()) {
final List<PaperCard> 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<PaperCard> 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<PaperCard> evolvingWilds = deckList.stream().filter(PaperCardPredicates.name("Evolving Wilds")).toList();
List<PaperCard> 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();

5
forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java
View File

@@ -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<CardEdition> allowedSets = qData.getFormat().getAllowedSetCodes().stream()
.map(editions::get)
.sorted().toList();
.sorted().collect(Collectors.toList());
// Sort unlockable sets by date
List<CardEdition> 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<ImmutablePair<CardEdition, Long>> excludedWithDistances = new ArrayList<>();

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1885,7 +1885,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
if (possibleReplacers.size() == 1) {
return first;
}
final List<String> res = possibleReplacers.stream().map(ReplacementEffect::toString).toList();
final List<String> 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<String> sts = possibleStatics.stream().map(StaticAbility::toString).toList();
final List<String> 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

2
forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java
View File

@@ -304,7 +304,7 @@ public final class LDAModelGenetrator {
//filter to just legal commanders
List<PaperCard> 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<legends.size(); ++i){