Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-03 06:37:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the display of abilities in lore

Browse Source
This commit is contained in:
Jules 2024-04-14 14:05:14 -07:00
parent ea2754bc98
commit e0e90e0eba
1 changed files with 35 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/Abilities.java
View File

@ -51,8 +51,8 @@ public class Abilities extends ItemStat<RandomAbilityListData, AbilityListData>
return list;
}
private String generalFormat, modifierIfAny, modifierForEach, modifierSplitter, abilitySplitter;
private boolean legacyFormat, useAbilitySplitter;
private String generalFormat, modifierIfAny, modifierForEach, modifierSplitter, abilitySplitter, modifierNewLine;
private boolean useAbilitySplitter;
private int modifiersPerLine;
@BackwardsCompatibility(version = "6.10")
@ -61,17 +61,21 @@ public class Abilities extends ItemStat<RandomAbilityListData, AbilityListData>
// COMPATIBILITY CODE FOR MI <6.10
if (!(configObject instanceof ConfigurationSection)) {
legacyFormat = true;
generalFormat = legacyLanguageFile.getString("ability-format");
modifierIfAny = "\n";
modifierNewLine = "\n";
modifierForEach = legacyLanguageFile.getString("ability-modifier");
modifierSplitter = "";
abilitySplitter = legacyLanguageFile.getString("ability-splitter");
useAbilitySplitter = abilitySplitter != null && !abilitySplitter.isEmpty();
modifiersPerLine = 1;
return;
}
final ConfigurationSection config = (ConfigurationSection) configObject;
generalFormat = config.getString("general-format");
modifierIfAny = config.getString("modifier-if-any");
modifierIfAny = config.getString("modifier-if-any", ""); // Backwards compatibility
modifierNewLine = "\n" + config.getString("modifier-new-line", ""); // Backwards compatibility
modifierForEach = config.getString("modifier-foreach");
modifierSplitter = config.getString("modifier-splitter");
abilitySplitter = config.getString("ability-splitter.format");
@ -81,31 +85,8 @@ public class Abilities extends ItemStat<RandomAbilityListData, AbilityListData>
@Override
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull AbilityListData data) {
final List<String> abilityLore = new ArrayList<>();
// Modify Lore
List<String> abilityLore = new ArrayList<>();
// DEPRECATED CODE which supports old versions of the stats.yml config
if (legacyFormat) {
data.getAbilities().forEach(ability -> {
abilityLore.add(generalFormat
.replace("{trigger}", MMOItems.plugin.getLanguage().getCastingModeName(ability.getTrigger()))
.replace("{ability}", ability.getAbility().getName()));
for (String modifier : ability.getModifiers()) {
item.getLore().registerPlaceholder("ability_" + ability.getAbility().getHandler().getId().toLowerCase() + "_" + modifier,
MythicLib.plugin.getMMOConfig().decimals.format(ability.getParameter(modifier)));
abilityLore.add(modifierForEach.replace("{modifier}", ability.getAbility().getParameterName(modifier)).replace("{value}",
MythicLib.plugin.getMMOConfig().decimals.format(ability.getParameter(modifier))));
}
if (useAbilitySplitter)
abilityLore.add(abilitySplitter);
});
}
// Up to date code
else {
data.getAbilities().forEach(ability -> {
final StringBuilder builder = new StringBuilder(generalFormat
.replace("{trigger}", MMOItems.plugin.getLanguage().getCastingModeName(ability.getTrigger()))
@ -113,22 +94,21 @@ public class Abilities extends ItemStat<RandomAbilityListData, AbilityListData>
if (!ability.getModifiers().isEmpty()) builder.append(modifierIfAny);
boolean modifierAppened = false;
boolean newLine = false;
int lineCounter = 0;
for (String modifier : ability.getModifiers()) {
final String formattedValue = MythicLib.plugin.getMMOConfig().decimals.format(ability.getParameter(modifier));
item.getLore().registerPlaceholder("ability_" + ability.getAbility().getHandler().getId().toLowerCase() + "_" + modifier, formattedValue);
if (modifierAppened) builder.append(modifierSplitter);
builder.append(newLine ? modifierNewLine : modifierSplitter);
builder.append(modifierForEach
.replace("{modifier}", ability.getAbility().getParameterName(modifier))
.replace("{value}", formattedValue));
modifierAppened = true;
newLine = false;
lineCounter++;
if (modifiersPerLine > 0 && lineCounter >= modifiersPerLine) {
lineCounter = 0;
modifierAppened = false;
builder.append("\n"); // Will be processed later on by MMOItems
newLine = true;
}
}
@ -137,9 +117,8 @@ public class Abilities extends ItemStat<RandomAbilityListData, AbilityListData>
if (useAbilitySplitter)
abilityLore.add(abilitySplitter);
});
}
if (useAbilitySplitter && abilityLore.size() > 0)
if (useAbilitySplitter && !abilityLore.isEmpty())
abilityLore.remove(abilityLore.size() - 1);
// Modify tags