♻️ Create common static method to map feature type to full text

Author: jboehm77

src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteFeat.java

@@ -1,7 +1,5 @@
 package dev.ebullient.convert.tools.dnd5e;
 
-import static dev.ebullient.convert.StringUtil.isPresent;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +25,13 @@ protected Tools5eQuteBase buildQuteResource() {
 
         List<ImageRef> images = getFluffImages(Tools5eIndexType.featFluff);
 
+        String category = featureTypeToFull(FeatFields.category.getTextOrEmpty(rootNode));
+        if (category.equalsIgnoreCase("Fighting Style, Paladin")) {
+            category = "Fighting Style Replacement (Paladin)";
+        } else if (category.equalsIgnoreCase("Fighting Style, Ranger")) {
+            category = "Fighting Style Replacement (Ranger)";
+        }
+
         // Initialize full entries with ability score increases merged
         JsonNode fullEntries = initFullEntries();
 
@@ -41,7 +46,7 @@ protected Tools5eQuteBase buildQuteResource() {
                 listPrerequisites(rootNode),
                 null, // Level coming someday..
                 SkillOrAbility.getAbilityScoreIncreases(FeatFields.ability.getFrom(rootNode)),
-                categoryToFull(FeatFields.category.getTextOrEmpty(rootNode)),
+                category,
                 images,
                 String.join("\n", text),
                 tags);
@@ -119,20 +124,6 @@ JsonNode entryToListItemItem(JsonNode abilityNode) {
                 .put("name", "Ability Score Increase")
                 .put("entry", SkillOrAbility.getAbilityScoreIncrease(abilityNode));
     }
-    protected String categoryToFull(String category) {
-        if (!isPresent(category)) {
-            return "";
-        }
-        return switch (category.toUpperCase()) {
-            case "EB" -> "Epic Boon Feat";
-            case "FS" -> "Fighting Style Feat";
-            case "FS:P" -> "Fighting Style Replacement (Paladin)";
-            case "FS:R" -> "Fighting Style Replacement (Ranger)";
-            case "G" -> "General Feat";
-            case "O" -> "Origin Feat";
-            default -> category;
-        };
-    };
 
     enum FeatFields implements JsonNodeReader {
         ability,

src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteOptionalFeature.java

@@ -1,7 +1,5 @@
 package dev.ebullient.convert.tools.dnd5e;
 
-import static dev.ebullient.convert.StringUtil.isPresent;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,6 +23,15 @@ protected Tools5eQuteBase buildQuteResource() {
             tags.add("optional-feature", featureType);
         }
 
+        String featureTypeFull = featureTypeToFull(typeList.get(0));
+        if (featureTypeFull.startsWith("Fighting Style")) {
+            featureTypeFull = "Fighting Style"; //trim class name, fighting styles can be for multiple classes
+        } else if (featureTypeFull.equalsIgnoreCase("Maneuver, Battle Master")) {
+            featureTypeFull = "Battle Master Maneuver";
+        } else if (featureTypeFull.equalsIgnoreCase("Maneuver, Cavalier V2 (UA)")) {
+            featureTypeFull = "Cavalier Maneuver, V2 (UA)";
+        }
+
         List<ImageRef> images = new ArrayList<>();
         List<String> text = getFluff(Tools5eIndexType.optionalfeatureFluff, "##", images);
         appendToText(text, SourceField.entries.getFrom(rootNode), "##");
@@ -35,27 +42,9 @@ protected Tools5eQuteBase buildQuteResource() {
                 listPrerequisites(rootNode),
                 null,
                 null,
-                featureTypeToFull(typeList.get(0)),
+                featureTypeFull,
                 images,
                 String.join("\n", text),
                 tags);
     }
-
-    protected String featureTypeToFull(String featureType) {
-        if (!isPresent(featureType)) {
-            return "";
-        }
-        return switch (featureType.toUpperCase()) {
-            case "AI" -> "Artificer Infusion";
-            case "AS" -> "Arcane Shot";
-            case "ED" -> "Elemental Discipline";
-            case "EI" -> "Eldritch Invocation";
-            case "FS:B", "FS:F", "FS:P", "FS:R" -> "Fighting Style";
-            case "MM" -> "Metamagic";
-            case "MV:B" -> "Battle Master Maneuver";
-            case "PB" -> "Pact Boon";
-            case "RN" -> "Rune Knight Rune";
-            default -> featureType;
-        };
-    };
 }

src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSource.java

@@ -1299,6 +1299,46 @@ default String convertCurrency(int cp) {
         return String.join(", ", result);
     }
 
+    default String featureTypeToFull(String featureType) {
+        return featureTypeToString(featureType);
+    }
+
+    public static String featureTypeToString(String featureType) {
+        if (!isPresent(featureType)) {
+            return "";
+        }
+        return switch (featureType.toUpperCase()) {
+            case "EB" -> "Epic Boon Feat";
+            case "FS" -> "Fighting Style Feat";
+            case "G" -> "General Feat";
+            case "O" -> "Origin Feat";
+            case "AI" -> "Artificer Infusion";
+            case "ED" -> "Elemental Discipline";
+            case "EI" -> "Eldritch Invocation";
+            case "MM" -> "Metamagic";
+            case "MV" -> "Maneuver";
+            case "MV:B" -> "Maneuver, Battle Master";
+            case "MV:C2-UA" -> "Maneuver, Cavalier V2 (UA)";
+            case "AS:V1-UA" -> "Arcane Shot, V1 (UA)";
+            case "AS:V2-UA" -> "Arcane Shot, V2 (UA)";
+            case "AS" -> "Arcane Shot";
+            case "OTH" -> "Other";
+            case "FS:F" -> "Fighting Style, Fighter";
+            case "FS:B" -> "Fighting Style, Bard";
+            case "FS:P" -> "Fighting Style, Paladin";
+            case "FS:R" -> "Fighting Style, Ranger";
+            case "PB" -> "Pact Boon";
+            case "OR" -> "Onomancy Resonant";
+            case "RN" -> "Rune Knight Rune";
+            case "AF" -> "Alchemical Formula";
+            case "TT" -> "Traveler's Trick";
+            case "BC" -> "Blood Curse";
+            case "CR" -> "Crimson Rite";
+            case "MTGN" -> "Mutagen";
+            default -> featureType;
+        };
+    };
+
     public static String spellLevelToText(String level) {
         return switch (level) {
             case "0", "c" -> "cantrip";

src/main/java/dev/ebullient/convert/tools/dnd5e/OptionalFeatureIndex.java

@@ -268,39 +268,19 @@ public boolean testFeaturesInUse(Function<String, Boolean> test) {
         }
 
         public String getTitle() {
-            return switch (abbreviation) {
-                case "AI" -> "Artificer Infusion";
-                case "ED" -> "Elemental Discipline";
-                case "EI" -> "Eldritch Invocation";
-                case "MM" -> "Metamagic";
-                case "MV" -> "Maneuver";
-                case "MV:B" -> "Maneuver, Battle Master";
-                case "MV:C2-UA" -> "Maneuver, Cavalier V2 (UA)";
-                case "AS:V1-UA" -> "Arcane Shot, V1 (UA)";
-                case "AS:V2-UA" -> "Arcane Shot, V2 (UA)";
-                case "AS" -> "Arcane Shot";
-                case "OTH" -> "Other";
-                case "FS:F" -> "Fighting Style, Fighter";
-                case "FS:B" -> "Fighting Style, Bard";
-                case "FS:P" -> "Fighting Style, Paladin";
-                case "FS:R" -> "Fighting Style, Ranger";
-                case "PB" -> "Pact Boon";
-                case "OR" -> "Onomancy Resonant";
-                case "RN" -> "Rune Knight Rune";
-                case "AF" -> "Alchemical Formula";
-                case "TT" -> "Traveler's Trick";
-                default -> {
-                    if (!homebrewMeta.isEmpty()) {
-                        yield homebrewMeta.values().stream()
-                                .map(hb -> hb.getOptionalFeatureType(abbreviation))
-                                .distinct()
-                                .collect(Collectors.joining("; "));
-                    }
-                    Tui.instance().warnf(Msg.NOT_SET, "Missing title for OptionalFeatureType in %s",
-                            abbreviation);
-                    yield abbreviation;
+            String title = JsonSource.featureTypeToString(abbreviation);
+            if (title.equalsIgnoreCase(abbreviation)) {
+                if (!homebrewMeta.isEmpty()) {
+                    return homebrewMeta.values().stream()
+                            .map(hb -> hb.getOptionalFeatureType(abbreviation))
+                            .distinct()
+                            .collect(Collectors.joining("; "));
                 }
-            };
+                Tui.instance().warnf(Msg.NOT_SET, "Missing title for OptionalFeatureType in %s",
+                        abbreviation);
+                return abbreviation;
+            }
+            return title;
         }
 
         private String getSource(HomebrewMetaTypes homebrewMeta) {