diff --git a/src/magic/model/MagicType.java b/src/magic/model/MagicType.java index 56cb307367..500a1f6667 100644 --- a/src/magic/model/MagicType.java +++ b/src/magic/model/MagicType.java @@ -5,30 +5,31 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import magic.translate.UiString; public enum MagicType { // these are supertypes - Basic, - Legendary, - Ongoing, - Snow, - World, + Basic(MagicTypeStr._SBasic), + Legendary(MagicTypeStr._SLegendary), + Ongoing(MagicTypeStr._SOngoing), + Snow(MagicTypeStr._SSnow), + World(MagicTypeStr._SWorld), // these are card types - Artifact, - Conspiracy, - Creature, - Enchantment, - Instant, - Land, - Phenomenon, - Plane, - Planeswalker, - Scheme, - Sorcery, - Tribal, - Vanguard, + Artifact(MagicTypeStr._SArtifact), + Conspiracy(MagicTypeStr._SConspiracy), + Creature(MagicTypeStr._SCreature), + Enchantment(MagicTypeStr._SEnchantment), + Instant(MagicTypeStr._SInstant), + Land(MagicTypeStr._SLand), + Phenomenon(MagicTypeStr._SPhenomenon), + Plane(MagicTypeStr._SPlane), + Planeswalker(MagicTypeStr._SPlaneswalker), + Scheme(MagicTypeStr._SScheme), + Sorcery(MagicTypeStr._SSorcery), + Tribal(MagicTypeStr._STribal), + Vanguard(MagicTypeStr._SVanguard), ; public static final Set ALL_CARD_TYPES = EnumSet.range(Artifact, Vanguard); @@ -62,9 +63,11 @@ public enum MagicType { ); private final int mask; + private final String displayName; - private MagicType() { - mask=1< types = new ArrayList<>(); for (MagicType type : MagicType.FILTER_TYPES) { - types.add(type); + types.add(type.getDisplayName()); } if (!listener.isDeckEditor()) { types.add(UiString.get(_S20));