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

Protection: cleanup some cases for Card

Browse Source
This commit is contained in:
Hans Mackowiak
2020-11-12 09:49:03 +01:00
parent e73111e63a
commit a62fc27a21
22 changed files with 62 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -55,22 +55,23 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
public static final String AllCreatureTypes = "AllCreatureTypes";
public enum CoreType {
Artifact(true),
Conspiracy(false),
Creature(true),
Emblem(false),
Enchantment(true),
Instant(false),
Land(true),
Phenomenon(false),
Plane(false),
Planeswalker(true),
Scheme(false),
Sorcery(false),
Tribal(false),
Vanguard(false);
Artifact(true, "artifacts"),
Conspiracy(false, "conspiracies"),
Creature(true, "creatures"),
Emblem(false, "emblems"),
Enchantment(true, "enchantments"),
Instant(false, "instants"),
Land(true, "lands"),
Phenomenon(false, "phenomenons"),
Plane(false, "planes"),
Planeswalker(true, "planeswalkers"),
Scheme(false, "schemes"),
Sorcery(false, "sorceries"),
Tribal(false, "tribals"),
Vanguard(false, "vanguards");
public final boolean isPermanent;
public final String pluralName;
private static Map<String, CoreType> stringToCoreType = EnumUtils.getEnumMap(CoreType.class);
private static final Set<String> allCoreTypeNames = stringToCoreType.keySet();
@@ -82,8 +83,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
return stringToCoreType.containsKey(name);
}
CoreType(final boolean permanent) {
CoreType(final boolean permanent, final String plural) {
isPermanent = permanent;
pluralName = plural;
}
}
@@ -704,6 +706,12 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
public static final BiMap<String,String> pluralTypes = HashBiMap.create();
// plural -> singular
public static final BiMap<String,String> singularTypes = pluralTypes.inverse();
static {
for (CoreType c : CoreType.values()) {
pluralTypes.put(c.name(), c.pluralName);
}
}
}
public static class Predicates {
public static Predicate<String> IS_LAND_TYPE = new Predicate<String>() {