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 pull request #8698 from kevlahnota/master4

Browse Source 
update Keyword get method
This commit is contained in:
kevlahnota
2025-09-12 05:17:38 +08:00
committed by GitHub
parent a1d67cf844 fd2d3c7bb9
commit 6b29e18a58
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -278,10 +278,36 @@ public enum Keyword {
return keywords;
}
public static Keyword get(String key) {
if (key.isEmpty())
return null;
return Arrays.stream(values()).filter(k -> key.equalsIgnoreCase(k.displayName)).findFirst().orElse(null);
public static Keyword get(String k) {
Keyword keyword = Keyword.UNDEFINED;
if (k == null || k.isEmpty())
return keyword;
// try to get real part
if (k.contains(":")) {
final String[] x = k.split(":", 2);
keyword = smartValueOf(x[0]);
} else if (k.contains(" ")) {
// First strike
keyword = smartValueOf(k);
// other keywords that contains other stuff like Enchant
if (keyword == Keyword.UNDEFINED) {
final String[] x = k.split(" ", 2);
final Keyword k2 = smartValueOf(x[0]);
// Keywords that needs to be undefined
if (k2 != Keyword.UNDEFINED) {
keyword = k2;
}
}
} else {
// Simple Keyword
keyword = smartValueOf(k);
}
return keyword;
}
private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<>();

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

@@ -110,7 +110,7 @@ public class AdvancedSearch {
if (input.getRules().getOtherPart().getKeywords() != null) {
for (String key : input.getRules().getOtherPart().getKeywords()) {
Keyword keyword = Keyword.get(key);
if (keyword != null)
if (!Keyword.UNDEFINED.equals(keyword))
keywords.add(keyword);
}
}
@@ -119,7 +119,7 @@ public class AdvancedSearch {
if (input.getRules().getMainPart().getKeywords() != null) {
for (String key : input.getRules().getMainPart().getKeywords()) {
Keyword keyword = Keyword.get(key);
if (keyword != null)
if (!Keyword.UNDEFINED.equals(keyword))
keywords.add(keyword);
}
}