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

Guava migration - Add StreamUtils.random collectors

Browse Source
This commit is contained in:
Jetz
2024-09-22 14:47:57 -04:00
parent c2f72bb3c2
commit 05d58c2fce
9 changed files with 159 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java
View File

@@ -22,9 +22,9 @@ import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.views.VDeckgen;
import forge.util.Aggregates;
import forge.util.Iterables;
import forge.util.StreamUtils;
import java.util.List;
import java.util.function.Predicate;
@@ -71,8 +71,10 @@ public enum CDeckgen implements ICDoc {
final Deck randomDeck = new Deck();
final Predicate<PaperCard> notBasicLand = PaperCardPredicates.fromRules(CardRulesPredicates.NOT_BASIC_LAND);
final Iterable<PaperCard> source = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCards(), notBasicLand);
randomDeck.getMain().addAllFlat(Aggregates.random(source, 15 * 5));
List<PaperCard> randomCards = FModel.getMagicDb().getCommonCards().streamUniqueCards()
.filter(notBasicLand)
.collect(StreamUtils.random(15 * 5));
randomDeck.getMain().addAllFlat(randomCards);
for(final String landName : MagicColor.Constant.BASIC_LANDS) {
randomDeck.getMain().add(landName, 1);