added 3-mode toggles for hide features, default to all affixes shown, fixed alt prompt rendering

Author: Nightwielder23

README.md

@@ -10,7 +10,7 @@ A Forge 1.20.1 mod that cleans up the affix and gem tooltips Apotheosis adds to
 - Merge empty sockets on socketed items into one summary line. Mixed sockets are supported: filled gems still render, with the empty count shown below.
 - Hide the bonus durability line.
 - Hide the Apotheosis affix summary block (Cold/Fire/HP%/Spell Resistance lines).
-- Hide the affix source line.
+- Always hide the affix source line (not configurable).
 - Hide the `[⌛ MM:SS]` cooldown markers and `[Stacking]` tags on affix lines without touching the affix text. Hold Alt to reveal.
 - Custom rarity color overrides for all six tiers (Common, Uncommon, Rare, Epic, Mythic, Ancient). Esoteric (Apotheotic Additions) maps to Ancient via namespace fallback.
 - Strip prefixes from affix names.
@@ -22,33 +22,35 @@ A Forge 1.20.1 mod that cleans up the affix and gem tooltips Apotheosis adds to
 
 Settings live in `config/apothic_tooltip_cleanup-client.toml`. The file regenerates from defaults if deleted.
 
+Most hide features use a three-mode toggle: `show` keeps the content fully visible, `alt` hides it by default and reveals it while Alt is held, and `delete` hides it permanently with no Alt reveal.
+
 ## config reference
 
 ### affix display
 
 `affix_display_mode` controls how affixes show on tooltips. Three options: `all` shows every affix, `top_n` shows the first N with Alt to expand the rest (default), `alt_only` hides every affix unless Alt is held.
 
-The "Hold Alt for full details" prompt also appears when other handlers hide content. With `hide_durability_bonus` enabled, the prompt shows on durable items even when no affixes were truncated; pressing Alt reveals the durability line.
+The "Hold Alt for full details" prompt also appears when other handlers hide content. With `durability_bonus_mode` set to `alt` (the default), the prompt shows on durable items even when no affixes were truncated; pressing Alt reveals the durability line.
 
 `affix_visible_count` is the N for `top_n` mode. Default 3.
 
 `affix_sort_order` is one of `default`, `rarity`, `alphabetical`, `type`.
 
-`clean_affix_prefixes` strips prefixes from affix names. Off by default.
+`affix_prefixes_mode` controls the affix type prefixes (While held, On hit, On block, Passive). `show` (default) keeps them, `alt` hides them unless Alt is held, `delete` removes them permanently.
 
 `hidden_affix_ids` is a list of translation key prefixes for affixes you want hidden entirely.
 
 ### affix tooltip lines
 
-`hide_source_line` hides the affix source line.
+The affix source line is always hidden. There is no config option for it.
 
-`disable_summarization` hides the Apotheosis summary block (Cold/Fire/HP%/Spell Resistance).
+`summarization_mode` controls the Apotheosis summary block (Cold/Fire/HP%/Spell Resistance). `show` keeps it, `alt` (default) hides it unless Alt is held, `delete` removes it permanently.
 
-`hide_durability_bonus` hides the "ignores X% of durability damage" line.
+`durability_bonus_mode` controls the "ignores X% of durability damage" line. `show` keeps it, `alt` (default) hides it unless Alt is held, `delete` removes it permanently.
 
-`disable_potion_descriptions` hides potion-style affix descriptions.
+`potion_descriptions_mode` controls potion-style affix descriptions. `show` (default) keeps them, `alt` hides them unless Alt is held, `delete` removes them permanently.
 
-`hide_affix_extras` hides the `[⌛ MM:SS]` cooldown markers and `[Stacking]` modifier tags on affix lines. The affix text itself stays intact; only the bracketed annotations are stripped. Holding Alt while the item is hovered reveals the full line including the hidden markers.
+`affix_extras_mode` controls the `[⌛ MM:SS]` cooldown markers and `[Stacking]` tags on affix lines; the affix text itself is never touched, only the bracketed annotations. `show` keeps them, `alt` (default) hides them unless Alt is held, `delete` removes them permanently.
 
 ### gem display
 

gradle.properties

@@ -48,12 +48,12 @@ mod_name=Apothic Tooltip Cleanup
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.1.1
+mod_version=1.2.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
 mod_group_id=com.nightwielder.apothictooltipcleanup
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
 mod_authors=Nightwielder23
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
-mod_description=Cleans up Apotheosis affix and gem tooltips. Configurable per feature. Client side, soft dependency on Apotheosis.
+mod_description=Cleans up Apotheosis affix and gem tooltips. Hideable features each toggle show, alt, or delete. Client side, soft dependency on Apotheosis.

src/main/java/com/nightwielder/apothictooltipcleanup/Config.java

@@ -1,5 +1,6 @@
 package com.nightwielder.apothictooltipcleanup;
 
+import com.nightwielder.apothictooltipcleanup.util.HideMode;
 import net.minecraftforge.common.ForgeConfigSpec;
 
 import java.util.Arrays;
@@ -14,15 +15,14 @@ public class Config {
     public static final ForgeConfigSpec.IntValue AFFIX_VISIBLE_COUNT;
     public static final ForgeConfigSpec.BooleanValue SHIFT_TO_EXPAND;
     public static final ForgeConfigSpec.ConfigValue<String> AFFIX_SORT_ORDER;
-    public static final ForgeConfigSpec.BooleanValue CLEAN_AFFIX_PREFIXES;
+    public static final ForgeConfigSpec.ConfigValue<String> AFFIX_PREFIXES_MODE;
     public static final ForgeConfigSpec.ConfigValue<List<? extends String>> HIDDEN_AFFIX_IDS;
 
     // Affix tooltip lines
-    public static final ForgeConfigSpec.BooleanValue HIDE_SOURCE_LINE;
-    public static final ForgeConfigSpec.BooleanValue DISABLE_SUMMARIZATION;
-    public static final ForgeConfigSpec.BooleanValue HIDE_DURABILITY_BONUS;
-    public static final ForgeConfigSpec.BooleanValue DISABLE_POTION_DESCRIPTIONS;
-    public static final ForgeConfigSpec.BooleanValue HIDE_AFFIX_EXTRAS;
+    public static final ForgeConfigSpec.ConfigValue<String> SUMMARIZATION_MODE;
+    public static final ForgeConfigSpec.ConfigValue<String> DURABILITY_BONUS_MODE;
+    public static final ForgeConfigSpec.ConfigValue<String> POTION_DESCRIPTIONS_MODE;
+    public static final ForgeConfigSpec.ConfigValue<String> AFFIX_EXTRAS_MODE;
 
     // Gem display (raw gems)
     public static final ForgeConfigSpec.ConfigValue<String> GEM_TOOLTIP_MODE;
@@ -52,16 +52,19 @@ public class Config {
                 " all = show every affix",
                 " top_n = show first N, rest visible with Alt held",
                 " alt_only = hide every affix unless Alt is held");
-        AFFIX_DISPLAY_MODE = builder.defineInList("affix_display_mode", "top_n", Arrays.asList("all", "top_n", "alt_only"));
+        AFFIX_DISPLAY_MODE = builder.defineInList("affix_display_mode", "all", Arrays.asList("all", "top_n", "alt_only"));
 
         builder.comment(" Number of affixes shown when mode is top_n.");
         AFFIX_VISIBLE_COUNT = builder.defineInRange("affix_visible_count", 3, 0, 99);
 
         builder.comment(" Sort order: default, rarity, alphabetical, type.");
         AFFIX_SORT_ORDER = builder.defineInList("affix_sort_order", "default", Arrays.asList("default", "rarity", "alphabetical", "type"));
 
-        builder.comment(" Strips prefixes from affix names.");
-        CLEAN_AFFIX_PREFIXES = builder.define("clean_affix_prefixes", false);
+        builder.comment(" Affix type prefixes (While held, On hit, On block, Passive).",
+                " show = always visible",
+                " alt = hidden unless Alt is held",
+                " delete = always hidden, Alt has no effect");
+        AFFIX_PREFIXES_MODE = builder.defineInList("affix_prefixes_mode", HideMode.SHOW, HideMode.OPTIONS);
 
         builder.comment(" Translation key prefixes of affixes to hide.");
         HIDDEN_AFFIX_IDS = builder.defineListAllowEmpty("hidden_affix_ids", Collections.emptyList(), o -> o instanceof String);
@@ -71,22 +74,30 @@ public class Config {
 
         builder.comment(" affix tooltip lines",
                 " ============================================================",
-                " Hides the affix source line.");
-        HIDE_SOURCE_LINE = builder.define("hide_source_line", false);
-
-        builder.comment(" Hides the summary block (Cold/Fire/HP%/Spell Resistance lines).");
-        DISABLE_SUMMARIZATION = builder.define("disable_summarization", false);
-
-        builder.comment(" Hides the \"ignores X% of durability damage\" line.");
-        HIDE_DURABILITY_BONUS = builder.define("hide_durability_bonus", false);
-
-        builder.comment(" Hides potion-style affix descriptions.");
-        DISABLE_POTION_DESCRIPTIONS = builder.define("disable_potion_descriptions", false);
-
-        builder.comment(" Hides the [⌛ MM:SS] cooldown markers and [Stacking] tags on affix lines.",
-                " Strips just the annotations, the affix text remains unchanged.",
-                " Hold Alt to view the full line including markers.");
-        HIDE_AFFIX_EXTRAS = builder.define("hide_affix_extras", true);
+                " The summary block (Cold/Fire/HP%/Spell Resistance lines).",
+                " show = always visible",
+                " alt = hidden unless Alt is held",
+                " delete = always hidden, Alt has no effect");
+        SUMMARIZATION_MODE = builder.defineInList("summarization_mode", HideMode.ALT, HideMode.OPTIONS);
+
+        builder.comment(" The \"ignores X% of durability damage\" line.",
+                " show = always visible",
+                " alt = hidden unless Alt is held",
+                " delete = always hidden, Alt has no effect");
+        DURABILITY_BONUS_MODE = builder.defineInList("durability_bonus_mode", HideMode.ALT, HideMode.OPTIONS);
+
+        builder.comment(" Potion-style affix descriptions.",
+                " show = always visible",
+                " alt = hidden unless Alt is held",
+                " delete = always hidden, Alt has no effect");
+        POTION_DESCRIPTIONS_MODE = builder.defineInList("potion_descriptions_mode", HideMode.SHOW, HideMode.OPTIONS);
+
+        builder.comment(" The [⌛ MM:SS] cooldown markers and [Stacking] tags on affix lines.",
+                " The affix text itself is never touched, only the annotations.",
+                " show = always visible",
+                " alt = hidden unless Alt is held",
+                " delete = always hidden, Alt has no effect");
+        AFFIX_EXTRAS_MODE = builder.defineInList("affix_extras_mode", HideMode.ALT, HideMode.OPTIONS);
 
         builder.comment(" gem display (raw gems)",
                 " ============================================================",

src/main/java/com/nightwielder/apothictooltipcleanup/handler/AffixMarkerStripper.java

@@ -1,6 +1,7 @@
 package com.nightwielder.apothictooltipcleanup.handler;
 
 import com.nightwielder.apothictooltipcleanup.Config;
+import com.nightwielder.apothictooltipcleanup.util.HideMode;
 import com.nightwielder.apothictooltipcleanup.util.TooltipMatcher;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -23,33 +24,41 @@ public final class AffixMarkerStripper {
 
     private AffixMarkerStripper() {}
 
-    public static void apply(List<Component> tooltip) {
-        if (!Config.HIDE_AFFIX_EXTRAS.get()) return;
-        // Holding Alt reveals the unstripped line, matching AltExpandHandler's reveal-on-hold UX.
-        if (Screen.hasAltDown()) return;
+    // Returns true only when a marker was stripped in Alt-revealable form (alt mode, Alt up), so
+    // AltExpandHandler shows the reveal prompt. show and delete modes never set that signal.
+    public static boolean apply(List<Component> tooltip) {
+        String mode = Config.AFFIX_EXTRAS_MODE.get();
+        boolean altDown = Screen.hasAltDown();
+        if (!HideMode.hides(mode, altDown)) return false;
+        boolean stripped = false;
         for (Component line : tooltip) {
             if (!TooltipMatcher.isBulletPrefix(line)) continue;
             String text = line.getString();
             if (text.indexOf('⌛') < 0 && !text.contains("[Stacking]")) continue;
             if (!(line.getContents() instanceof TranslatableContents tc)) continue;
             Object[] args = tc.getArgs();
             if (args.length == 0 || !(args[0] instanceof Component inner)) continue;
-            stripMarkerSiblings(inner.getSiblings());
+            stripped |= stripMarkerSiblings(inner.getSiblings());
         }
+        return stripped && HideMode.revealable(mode, altDown);
     }
 
     // Reverse walk so removals don't invalidate later indices. When a marker sibling is removed
     // we also drop the preceding " " separator so the bullet doesn't render with a trailing space.
-    private static void stripMarkerSiblings(List<Component> siblings) {
+    // Returns true if any marker sibling was removed.
+    private static boolean stripMarkerSiblings(List<Component> siblings) {
+        boolean removed = false;
         for (int i = siblings.size() - 1; i >= 0; i--) {
             String key = TooltipMatcher.getKey(siblings.get(i));
             if (!COOLDOWN_KEY.equals(key) && !STACKING_KEY.equals(key)) continue;
             siblings.remove(i);
+            removed = true;
             if (i > 0 && isLiteralSpace(siblings.get(i - 1))) {
                 siblings.remove(i - 1);
                 i--;
             }
         }
+        return removed;
     }
 
     private static boolean isLiteralSpace(Component component) {

src/main/java/com/nightwielder/apothictooltipcleanup/handler/AltExpandHandler.java

@@ -15,61 +15,94 @@ private AltExpandHandler() {}
     // shift_to_expand is fully deprecated and no longer read; affix_display_mode controls this now.
     // Shift triggers vanilla quick-move and EpicFight's innate skill display, and Ctrl conflicts
     // with other tooltip mods, so the expand gate is Alt.
-    public static void apply(List<Component> tooltip) {
-        String mode = Config.AFFIX_DISPLAY_MODE.get();
-        if ("all".equalsIgnoreCase(mode)) return;
+    //
+    // Runs last in the tooltip pass: it truncates affixes for top_n / alt_only mode and adds the
+    // single "Hold Alt for full details" prompt. anyAltRevealableHidden carries whether any feature
+    // hid content this pass that Alt can bring back; delete-mode hides are excluded, so the prompt
+    // never promises to reveal something it cannot. The prompt shows for those reveals even when
+    // affix truncation is off (mode = all).
+    public static void apply(List<Component> tooltip, boolean anyAltRevealableHidden) {
+        // Alt held: every hide handler no-ops this pass, so the user already sees everything and no
+        // prompt is needed.
         if (Screen.hasAltDown()) return;
 
-        // Apoth 7.x renders "Fits in:" as a literal Component without a translation key, so we
-        // detect gem tooltips by exact text match instead. gem Fits In bullets use the same
-        // dot_prefix key as affix bullets, so without this bail the truncation budget would eat
-        // gem categories on multi-category gems.
-        for (Component line : tooltip) {
-            if ("Fits in:".equals(line.getString())) {
-                return;
-            }
-        }
+        boolean anythingHidden = anyAltRevealableHidden;
+        int insertIndex = -1;
 
-        boolean altOnly = "alt_only".equalsIgnoreCase(mode);
-        int visibleCount = altOnly ? 0 : Math.max(0, Config.AFFIX_VISIBLE_COUNT.get());
+        // Truncation only applies outside "all" mode, and never on gem tooltips: gem "Fits in:"
+        // bullets share the dot_prefix key with affix lines, so the budget would otherwise eat
+        // gem categories on multi-category gems.
+        String mode = Config.AFFIX_DISPLAY_MODE.get();
+        if (!"all".equalsIgnoreCase(mode) && !isGemTooltip(tooltip)) {
+            boolean altOnly = "alt_only".equalsIgnoreCase(mode);
+            int visibleCount = altOnly ? 0 : Math.max(0, Config.AFFIX_VISIBLE_COUNT.get());
 
-        int affixesKept = 0;
-        int liveIndex = 0;
-        int insertIndex = -1;
-        // True if this handler removed any line. The prompt must appear whenever Alt would reveal
-        // something, including the case where only the durability bonus was stripped and no
-        // affixes were truncated.
-        boolean anythingHidden = false;
-        Iterator<Component> it = tooltip.iterator();
-        while (it.hasNext()) {
-            Component line = it.next();
-            if (DurabilityHider.isDurableLine(line)) {
-                if (insertIndex < 0) insertIndex = liveIndex;
-                it.remove();
-                anythingHidden = true;
-                continue;
-            }
-            if (TooltipMatcher.isAffixLine(line)) {
-                if (affixesKept < visibleCount) {
-                    affixesKept++;
+            int affixesKept = 0;
+            int liveIndex = 0;
+            Iterator<Component> it = tooltip.iterator();
+            while (it.hasNext()) {
+                Component line = it.next();
+                // Durability is owned by DurabilityHider; leave it in place rather than counting it
+                // against the affix budget or truncating it as an affix.
+                if (DurabilityHider.isDurableLine(line)) {
                     liveIndex++;
+                    continue;
+                }
+                if (TooltipMatcher.isAffixLine(line)) {
+                    if (affixesKept < visibleCount) {
+                        affixesKept++;
+                        liveIndex++;
+                    } else {
+                        if (insertIndex < 0) insertIndex = liveIndex;
+                        it.remove();
+                        anythingHidden = true;
+                    }
                 } else {
-                    if (insertIndex < 0) insertIndex = liveIndex;
-                    it.remove();
-                    anythingHidden = true;
+                    liveIndex++;
                 }
-            } else {
-                liveIndex++;
             }
         }
 
         if (!anythingHidden) return;
 
+        // With no truncation (mode = all) nothing set insertIndex. Appending at the end drops the
+        // prompt below the attribute block, where a tall tooltip clips it off the bottom of the
+        // screen, so anchor it right after the last affix line instead.
+        if (insertIndex < 0) {
+            insertIndex = lastAffixInsertIndex(tooltip);
+        }
+
         Component prompt = Component.literal("Hold Alt for full details").withStyle(ChatFormatting.DARK_GRAY);
         if (insertIndex >= 0 && insertIndex <= tooltip.size()) {
             tooltip.add(insertIndex, prompt);
         } else {
             tooltip.add(prompt);
         }
     }
+
+    // Index just after the last affix line. Falls back to the start of the vanilla attribute block
+    // ("When in Main Hand:" et al, keyed item.modifiers.*), then to -1 so the caller appends.
+    private static int lastAffixInsertIndex(List<Component> tooltip) {
+        int lastAffix = -1;
+        int attributeBlock = -1;
+        for (int i = 0; i < tooltip.size(); i++) {
+            Component line = tooltip.get(i);
+            if (TooltipMatcher.isAffixLine(line)) {
+                lastAffix = i;
+            } else if (attributeBlock < 0 && TooltipMatcher.keyStartsWith(line, "item.modifiers.")) {
+                attributeBlock = i;
+            }
+        }
+        if (lastAffix >= 0) return lastAffix + 1;
+        return attributeBlock;
+    }
+
+    // Apoth 7.x renders "Fits in:" as a literal Component without a translation key, so gem
+    // tooltips are detected by exact text match.
+    private static boolean isGemTooltip(List<Component> tooltip) {
+        for (Component line : tooltip) {
+            if ("Fits in:".equals(line.getString())) return true;
+        }
+        return false;
+    }
 }