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

MagicColor: use Enum for Human chooseColors

Browse Source
This commit is contained in:
Hans Mackowiak
2025-09-10 21:48:38 +02:00
parent 10d359e7d7
commit 21e458237d
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -993,7 +993,7 @@ public class DeckRecognizer {
private static String getMagicColourLabel(MagicColor.Color magicColor) { private static String getMagicColourLabel(MagicColor.Color magicColor) {
if (magicColor == null) // Multicolour if (magicColor == null) // Multicolour
return String.format("%s {W}{U}{B}{R}{G}", getLocalisedMagicColorName("Multicolour")); return String.format("%s {W}{U}{B}{R}{G}", Localizer.getInstance().getMessage("lblMulticolor"));
return String.format("%s %s", magicColor.getLocalizedName(), magicColor.getSymbol()); return String.format("%s %s", magicColor.getLocalizedName(), magicColor.getSymbol());
} }
@@ -1039,22 +1039,6 @@ public class DeckRecognizer {
}; };
} }
/**
* Get the magic color by the localised/translated name.
* @param localisedName String of localised color name.
* @return The string of the magic color.
*/
public static String getColorNameByLocalisedName(String localisedName) {
Localizer localizer = Localizer.getInstance();
if(localisedName.equals(localizer.getMessage("lblWhite"))) return MagicColor.Constant.WHITE;
if(localisedName.equals(localizer.getMessage("lblBlue"))) return MagicColor.Constant.BLUE;
if(localisedName.equals(localizer.getMessage("lblBlack"))) return MagicColor.Constant.BLACK;
if(localisedName.equals(localizer.getMessage("lblRed"))) return MagicColor.Constant.RED;
if(localisedName.equals(localizer.getMessage("lblGreen"))) return MagicColor.Constant.GREEN;
return "";
}
public static boolean isDeckName(final String lineAsIs) { public static boolean isDeckName(final String lineAsIs) {
if (lineAsIs == null) if (lineAsIs == null)
return false; return false;

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

@@ -10,7 +10,6 @@ import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostShard; import forge.card.mana.ManaCostShard;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckRecognizer;
import forge.deck.DeckSection; import forge.deck.DeckSection;
import forge.game.*; import forge.game.*;
import forge.game.ability.AbilityKey; import forge.game.ability.AbilityKey;
@@ -1833,9 +1832,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override @Override
public List<String> chooseColors(final String message, final SpellAbility sa, final int min, final int max, public List<String> chooseColors(final String message, final SpellAbility sa, final int min, final int max,
List<String> options) { List<String> options) {
options = options.stream().map(DeckRecognizer::getLocalisedMagicColorName).collect(Collectors.toList()); List<MagicColor.Color> enumOptions = options.stream().map(s -> MagicColor.Color.fromByte(MagicColor.fromName(s))).collect(Collectors.toList());
List<String> choices = getGui().getChoices(message, min, max, options); List<MagicColor.Color> enumChoices = getGui().getChoices(message, min, max, enumOptions);
return choices.stream().map(DeckRecognizer::getColorNameByLocalisedName).collect(Collectors.toList()); return enumChoices.stream().map(MagicColor.Color::getName).collect(Collectors.toList());
} }
@Override @Override