Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Code factorization

Browse Source
This commit is contained in:
Indyuce 2022-10-12 00:01:28 +02:00
parent b2987371f8
commit c5177c8fc2
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java
View File

@ -9,6 +9,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue; import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue;
import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -96,37 +97,20 @@ public class ClassSkill implements CooldownObject {
} }
public List<String> calculateLore(PlayerData data, int x) { public List<String> calculateLore(PlayerData data, int x) {
List<String> list = new ArrayList<>();
Map<String, String> placeholders = calculateModifiers(x); // Calculate placeholders
placeholders.put("mana_name", data.getProfess().getManaDisplay().getName()); Placeholders placeholders = new Placeholders();
placeholders.put("mana_color", data.getProfess().getManaDisplay().getFull().toString()); modifiers.keySet().forEach(modifier -> placeholders.register(modifier, modifiers.get(modifier).getDisplay(x)));
skill.getLore().forEach(str -> list.add(applyPlaceholders(data.getPlayer(), placeholders, str))); placeholders.register("mana_name", data.getProfess().getManaDisplay().getName());
placeholders.register("mana_color", data.getProfess().getManaDisplay().getFull().toString());
// Build string arraylist
List<String> list = new ArrayList<>();
skill.getLore().forEach(str -> list.add(placeholders.apply(data.getPlayer(), str)));
return list; return list;
} }
private String applyPlaceholders(Player player, Map<String, String> placeholders, String str) {
String explored = str;
while (explored.contains("{") && explored.substring(explored.indexOf("{")).contains("}")) {
final int begin = explored.indexOf("{"), end = explored.indexOf("}");
String holder = explored.substring(begin + 1, end);
if (placeholders.containsKey(holder))
str = str.replace("{" + holder + "}", placeholders.get(holder));
// Increase counter
explored = explored.substring(end + 1);
}
return MMOCore.plugin.placeholderParser.parse(player, str);
}
private Map<String, String> calculateModifiers(int x) {
Map<String, String> map = new HashMap<>();
modifiers.keySet().forEach(modifier -> map.put(modifier, modifiers.get(modifier).getDisplay(x)));
return map;
}
private LinearValue readLinearValue(LinearValue current, ConfigurationSection config) { private LinearValue readLinearValue(LinearValue current, ConfigurationSection config) {
return current instanceof IntegerLinearValue ? new IntegerLinearValue(config) : new LinearValue(config); return current instanceof IntegerLinearValue ? new IntegerLinearValue(config) : new LinearValue(config);
} }