mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
fix crash Android 8-13 NoSuchMethodError, prevent crash for missing card
This commit is contained in:
@@ -878,7 +878,7 @@ public class StaticData {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList());
|
List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList());
|
||||||
List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList());
|
List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList());
|
||||||
List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList());
|
List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList());
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
|
|||||||
public final FCollectionView<SpellAbility> getManaAbilities() {
|
public final FCollectionView<SpellAbility> getManaAbilities() {
|
||||||
FCollection<SpellAbility> newCol = new FCollection<>();
|
FCollection<SpellAbility> newCol = new FCollection<>();
|
||||||
updateSpellAbilities(newCol, true);
|
updateSpellAbilities(newCol, true);
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
newCol.addAll(abilities.stream().filter(SpellAbility::isManaAbility).collect(Collectors.toList()));
|
newCol.addAll(abilities.stream().filter(SpellAbility::isManaAbility).collect(Collectors.toList()));
|
||||||
card.updateSpellAbilities(newCol, this, true);
|
card.updateSpellAbilities(newCol, this, true);
|
||||||
return newCol;
|
return newCol;
|
||||||
@@ -375,7 +375,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
|
|||||||
public final FCollectionView<SpellAbility> getNonManaAbilities() {
|
public final FCollectionView<SpellAbility> getNonManaAbilities() {
|
||||||
FCollection<SpellAbility> newCol = new FCollection<>();
|
FCollection<SpellAbility> newCol = new FCollection<>();
|
||||||
updateSpellAbilities(newCol, false);
|
updateSpellAbilities(newCol, false);
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
newCol.addAll(abilities.stream().filter(Predicate.not(SpellAbility::isManaAbility)).collect(Collectors.toList()));
|
newCol.addAll(abilities.stream().filter(Predicate.not(SpellAbility::isManaAbility)).collect(Collectors.toList()));
|
||||||
card.updateSpellAbilities(newCol, this, false);
|
card.updateSpellAbilities(newCol, this, false);
|
||||||
return newCol;
|
return newCol;
|
||||||
@@ -390,7 +390,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
|
|||||||
if (null != mana) {
|
if (null != mana) {
|
||||||
leftAbilities = leftAbilities.stream()
|
leftAbilities = leftAbilities.stream()
|
||||||
.filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
|
.filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
newCol.addAll(leftAbilities);
|
newCol.addAll(leftAbilities);
|
||||||
@@ -402,7 +402,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
|
|||||||
if (null != mana) {
|
if (null != mana) {
|
||||||
rightAbilities = rightAbilities.stream()
|
rightAbilities = rightAbilities.stream()
|
||||||
.filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
|
.filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
newCol.addAll(rightAbilities);
|
newCol.addAll(rightAbilities);
|
||||||
|
|||||||
@@ -517,8 +517,8 @@ public class DeckImportController {
|
|||||||
PaperCard card = token.getCard();
|
PaperCard card = token.getCard();
|
||||||
String cardName = card.getName();
|
String cardName = card.getName();
|
||||||
CardPool substitutes = availableInventory.getFilteredPool(c -> c.getName().equals(cardName));
|
CardPool substitutes = availableInventory.getFilteredPool(c -> c.getName().equals(cardName));
|
||||||
// Stream.toList() is only supported on Android 14 and above ref: https://developer.android.com/reference/java/util/stream/Stream#toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
// use Collectors.toList() to support Android 8 to 13....
|
// ref: https://developer.android.com/reference/java/util/stream/Stream#toList()
|
||||||
List<Map.Entry<PaperCard, Integer>> sortedSubstitutes = StreamUtil.stream(substitutes).sorted(Comparator.comparingInt(Map.Entry::getValue)).collect(Collectors.toList());
|
List<Map.Entry<PaperCard, Integer>> sortedSubstitutes = StreamUtil.stream(substitutes).sorted(Comparator.comparingInt(Map.Entry::getValue)).collect(Collectors.toList());
|
||||||
int neededQuantity = token.getQuantity();
|
int neededQuantity = token.getQuantity();
|
||||||
for(Token found : replacementList) {
|
for(Token found : replacementList) {
|
||||||
|
|||||||
@@ -437,7 +437,7 @@ public class BoosterDraft implements IBoosterDraft {
|
|||||||
CompletableFuture.allOf(futuresArray).join();
|
CompletableFuture.allOf(futuresArray).join();
|
||||||
futures.clear();
|
futures.clear();
|
||||||
}
|
}
|
||||||
// stream().toList() causes crash on Android, use Collectors.toList()
|
// stream().toList() causes crash on Android 8-13, use Collectors.toList()
|
||||||
customs.addAll(queue.stream().collect(Collectors.toList()));
|
customs.addAll(queue.stream().collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
return customs;
|
return customs;
|
||||||
|
|||||||
Reference in New Issue
Block a user