radimous/VHatCanIRoll
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix effect avoidance

Browse source
This commit is contained in:
radimous 2024-12-04 22:59:43 +01:00
parent e9469a262b
commit dbe0f3356f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java
View file

@ -80,25 +80,25 @@ public class Modifiers {
String modGr = modifierTierGroup.getModifierGroup(); String modGr = modifierTierGroup.getModifierGroup();
MutableComponent newMod = getModifierComponent(VaultGearAttributeRegistry.getAttribute(modifierTierGroup.getAttribute()),mTierList); MutableComponent modComp = getModifierComponent(VaultGearAttributeRegistry.getAttribute(modifierTierGroup.getAttribute()),mTierList);
int weight = modTierListWeight(mTierList); int weight = modTierListWeight(mTierList);
if (Config.SHOW_WEIGHT.get() && modifierCategory == ModifierCategory.NORMAL) { if (Config.SHOW_WEIGHT.get() && modifierCategory == ModifierCategory.NORMAL) {
newMod.append(new TextComponent(" w"+weight).withStyle(ChatFormatting.GRAY)); modComp.append(new TextComponent(" w"+weight).withStyle(ChatFormatting.GRAY));
} }
if (Config.SHOW_CHANCE.get() && modifierCategory == ModifierCategory.NORMAL) { if (Config.SHOW_CHANCE.get() && modifierCategory == ModifierCategory.NORMAL) {
newMod.append(new TextComponent(String.format(" %.2f%%", ((double) weight * 100 / totalWeight))).withStyle(ChatFormatting.GRAY)); modComp.append(new TextComponent(String.format(" %.2f%%", ((double) weight * 100 / totalWeight))).withStyle(ChatFormatting.GRAY));
} }
if (groupCounts.get(modGr) > 1) { if (groupCounts.get(modGr) > 1) {
groupedModifiers.computeIfAbsent(modGr, k -> new ArrayList<>()).add(newMod); groupedModifiers.computeIfAbsent(modGr, k -> new ArrayList<>()).add(modComp);
continue; continue;
} }
MutableComponent full = new TextComponent(" "); MutableComponent full = new TextComponent(" ");
full.append(newMod); full.append(modComp);
if (Config.ALLOW_DUPE.get() || !(componentList.get(componentList.size() - 1).getString()).equals(full.getString())) { //dumb way to fix ability lvl+ duplication if (Config.ALLOW_DUPE.get() || !(componentList.get(componentList.size() - 1).getString()).equals(full.getString())) { //dumb way to fix ability lvl+ duplication
componentList.add(full); componentList.add(full);
@ -235,7 +235,7 @@ public class Modifiers {
//FIXME: poison avoidance was changed to single generic "Effect Avoidance" and it's not working //FIXME: poison avoidance was changed to single generic "Effect Avoidance" and it's not working
//FIXME: clouds with roman numerals are not working //FIXME: clouds with roman numerals are not working
if (atrName.equals("the_vault:effect_avoidance") && minConfigDisplay != null) { if ((atrName.equals("the_vault:effect_avoidance") || atrName.equals("the_vault:effect_list_avoidance")) && minConfigDisplay != null) {
// res -> "30% - 50%" // res -> "30% - 50%"
// single -> "30% Poison Avoidance" // single -> "30% Poison Avoidance"
// minRange -> "30%" // minRange -> "30%"
@ -246,6 +246,7 @@ public class Modifiers {
// res -> "30% - 50% Poison Avoidance" // res -> "30% - 50% Poison Avoidance"
} }
} }
if (minConfig instanceof EffectGearAttribute.Config minEffectConfig if (minConfig instanceof EffectGearAttribute.Config minEffectConfig
&& maxConfig instanceof EffectGearAttribute.Config && maxConfig instanceof EffectGearAttribute.Config
&& maxConfigDisplay != null) { && maxConfigDisplay != null) {