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

Merge master

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-02-09 17:15:06 +09:00
parent 218e21fcd3 7a13cc9d54
commit 24800840be
345 changed files with 340 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -41,16 +41,30 @@ import forge.util.CardTranslation;
public class AdvancedSearch {
public enum FilterOption {
NONE("lblNone", null, null, null),
CARD_NAME("lblName", PaperCard.class, FilterOperator.STRING_OPS, new StringEvaluator<PaperCard>() {
CARD_NAME("lblName", PaperCard.class, FilterOperator.STRINGS_OPS, new StringEvaluator<PaperCard>() {
@Override
protected String getItemValue(PaperCard input) {
return input.getName();
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
Set<String> names = new HashSet<>();
names.add(input.getName());
names.add(CardTranslation.getTranslatedName(input.getName()));
return names;
}
}),
CARD_RULES_TEXT("lblRulesText", PaperCard.class, FilterOperator.STRING_OPS, new StringEvaluator<PaperCard>() {
CARD_RULES_TEXT("lblRulesText", PaperCard.class, FilterOperator.STRINGS_OPS, new StringEvaluator<PaperCard>() {
@Override
protected String getItemValue(PaperCard input) {
return input.getRules().getOracleText();
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
Set<String> names = new HashSet<>();
names.add(input.getRules().getOracleText());
names.add(CardTranslation.getTranslatedOracle(input.getName()));
return names;
}
}),
CARD_KEYWORDS("lblKeywords", PaperCard.class, FilterOperator.COLLECTION_OPS, new CustomListEvaluator<PaperCard, Keyword>(Keyword.getAllKeywords()) {
@@ -737,6 +751,18 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
for (String input : inputs) {
if (apply(input, values)) {
return true;
}
}
return false;
}
return false;
}
}),
STARTS_WITH("lblStartsWith", "%1$s starts with '%2$s'", FilterValueCount.ONE, new OperatorEvaluator<String>() {
@Override
@@ -746,6 +772,18 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
for (String input : inputs) {
if (apply(input, values)) {
return true;
}
}
return false;
}
return false;
}
}),
ENDS_WITH("lblEndsWith", "%1$s ends with '%2$s'", FilterValueCount.ONE, new OperatorEvaluator<String>() {
@Override
@@ -755,6 +793,18 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
for (String input : inputs) {
if (apply(input, values)) {
return true;
}
}
return false;
}
return false;
}
}),
//Custom list operators
@@ -915,6 +965,9 @@ public class AdvancedSearch {
public static final FilterOperator[] STRING_OPS = new FilterOperator[] {
CONTAINS, STARTS_WITH, ENDS_WITH
};
public static final FilterOperator[] STRINGS_OPS = new FilterOperator[] {
CONTAINS, STARTS_WITH, ENDS_WITH
};
public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[] {
IS_ANY
};
@@ -969,27 +1022,32 @@ public class AdvancedSearch {
@SuppressWarnings("unchecked")
public final Filter<T> createFilter(FilterOption option, FilterOperator operator) {
final List<V> values = getValues(option, operator);
if (values == null || values.isEmpty()) { return null; }
if (values == null || values.isEmpty()) {
return null;
}
String caption = getCaption(values, option, operator);
final OperatorEvaluator<V> evaluator = (OperatorEvaluator<V>)operator.evaluator;
Predicate<T> predicate;
if (option.operatorOptions == FilterOperator.MULTI_LIST_OPS || option.operatorOptions == FilterOperator.COMBINATION_OPS || option.operatorOptions == FilterOperator.COLLECTION_OPS) {
predicate = new Predicate<T>() {
@Override
public boolean apply(T input) {
return evaluator.apply(getItemValues(input), values);
}
};
}
else {
predicate = new Predicate<T>() {
@Override
public boolean apply(T input) {
return evaluator.apply(getItemValue(input), values);
}
};
final OperatorEvaluator<V> evaluator = (OperatorEvaluator<V>) operator.evaluator;
Predicate<T> predicate = new Predicate<T>() {
@Override
public boolean apply(T input) {
return evaluator.apply(getItemValue(input), values);
}
};
;
final FilterOperator[][] manyValueOperators = { FilterOperator.MULTI_LIST_OPS,
FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS };
for (FilterOperator[] oper : manyValueOperators) {
if (option.operatorOptions == oper) {
predicate = new Predicate<T>() {
@Override
public boolean apply(T input) {
return evaluator.apply(getItemValues(input), values);
}
};
break;
}
}
return new Filter<>(option, operator, caption, predicate);
}

8
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -58,13 +58,17 @@ public enum ColumnDef {
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return toSortableName(CardTranslation.getTranslatedName(from.getKey().getName()));
if (from.getKey() instanceof PaperCard)
return toSortableName(from.getKey().toString());
return toSortableName(from.getKey().getName());
}
},
new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) {
return CardTranslation.getTranslatedName(from.getKey().getName());
if (from.getKey() instanceof PaperCard)
return from.getKey().toString();
return from.getKey().getName();
}
}),

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

@@ -1655,12 +1655,12 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
CardFaceView cardFaceView;
List<CardFaceView> choices = new ArrayList<>();
for (ICardFace cardFace : cards) {
cardFaceView = new CardFaceView(cardFace.getName());
cardFaceView = new CardFaceView(CardTranslation.getTranslatedName(cardFace.getName()), cardFace.getName());
choices.add(cardFaceView);
}
Collections.sort(choices);
cardFaceView = getGui().one(message, choices);
return StaticData.instance().getCommonCards().getFaceByName(cardFaceView.getName());
return StaticData.instance().getCommonCards().getFaceByName(cardFaceView.getOracleName());
}
@Override
@@ -2071,7 +2071,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
}
public class DevModeCheats implements IDevModeCheats {
private ICardFace lastAdded;
private CardFaceView lastAdded;
private ZoneType lastAddedZone;
private Player lastAddedPlayer;
private SpellAbility lastAddedSA;
@@ -2504,15 +2504,21 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
final CardDb carddb = FModel.getMagicDb().getCommonCards();
final List<ICardFace> faces = Lists.newArrayList(carddb.getAllFaces());
Collections.sort(faces);
List<CardFaceView> choices = new ArrayList<>();
CardFaceView cardFaceView;
for (ICardFace cardFace : faces) {
cardFaceView = new CardFaceView(CardTranslation.getTranslatedName(cardFace.getName()), cardFace.getName());
choices.add(cardFaceView);
}
Collections.sort(choices);
// use standard forge's list selection dialog
final ICardFace f = repeatLast ? lastAdded : getGui().oneOrNone(localizer.getMessage("lblNameTheCard"), faces);
final CardFaceView f = repeatLast ? lastAdded : getGui().oneOrNone(localizer.getMessage("lblNameTheCard"), choices);
if (f == null) {
return;
}
final PaperCard c = carddb.getUniqueByName(f.getName());
final PaperCard c = carddb.getUniqueByName(f.getOracleName());
final Card forgeCard = Card.fromPaperCard(c, p);
forgeCard.setTimestamp(getGame().getNextTimestamp());