From b90d503174c8b16f0e0de79c2b110d4da3527105 Mon Sep 17 00:00:00 2001 From: radimous Date: Wed, 4 Dec 2024 23:11:47 +0100 Subject: [PATCH] hide groups with no rollable modifiers --- .../com/radimous/vhatcaniroll/logic/Modifiers.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java b/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java index 848ef6b..08cc840 100644 --- a/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java +++ b/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java @@ -54,14 +54,18 @@ public class Modifiers { if (!Config.SHOW_ABILITY_ENHANCEMENTS.get() && affixTagGroup.equals(VaultGearTierConfig.ModifierAffixTagGroup.ABILITY_ENHANCEMENT)) { return componentList; } - if (modifierGroup.get(affixTagGroup).isEmpty()) { - return componentList; - } - componentList.add(new TextComponent(affixTagGroup.toString().replace("_", " ")).withStyle(ChatFormatting.BOLD)); + int totalWeight = modifierGroup.get(affixTagGroup).stream() .mapToInt(x -> getModifierTiers(lvl, x, modifierCategory).stream().mapToInt(VaultGearTierConfig.ModifierTier::getWeight).sum()) .sum(); + + if (totalWeight == 0) { + return componentList; + } + + componentList.add(new TextComponent(affixTagGroup.toString().replace("_", " ")).withStyle(ChatFormatting.BOLD)); + if (Config.SHOW_WEIGHT.get() && modifierCategory == ModifierCategory.NORMAL) { componentList.add(new TextComponent("Total Weight: " + totalWeight).withStyle(ChatFormatting.BOLD)); } @@ -233,7 +237,6 @@ public class Modifiers { return abilityLvlComponent(res, atr, minConfigAbility); } - //FIXME: poison avoidance was changed to single generic "Effect Avoidance" and it's not working //FIXME: clouds with roman numerals are not working if ((atrName.equals("the_vault:effect_avoidance") || atrName.equals("the_vault:effect_list_avoidance")) && minConfigDisplay != null) { // res -> "30% - 50%"