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

Prev commit rollback, added /mi update apply 7

Browse Source
This commit is contained in:
Jules 2022-02-07 20:27:05 +01:00
parent 4f31f19fc0
commit ed0dfe95c2
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Indyuce/mmoitems/gui/edition/AbilityEdition.java
View File

@ -98,7 +98,7 @@ public class AbilityEdition extends EditionInventory {
if (ability != null) {
ConfigurationSection section = getEditedSection().getConfigurationSection("ability." + configKey);
for (String modifier : ((SkillHandler<?>) ability.getHandler()).getModifiers()) {
for (String modifier : ability.getHandler().getModifiers()) {
ItemStack modifierItem = VersionMaterial.GRAY_DYE.toItem();
ItemMeta modifierItemMeta = modifierItem.getItemMeta();
modifierItemMeta.setDisplayName(ChatColor.GREEN + MMOUtils.caseOnWords(modifier.toLowerCase().replace("-", " ")));

7
src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java
View File

@ -326,18 +326,15 @@ public class PlayerListener implements Listener {
// Create registered skill
RegisteredSkill registeredSkill = new RegisteredSkill(event.getCast().getHandler(), event.getCast().getHandler().getId());
for (Object obj : event.getCast().getHandler().getModifiers()) {
String mod = obj.toString();
for (String mod : event.getCast().getHandler().getModifiers()) {
registeredSkill.setDefaultValue(mod, event.getMetadata().getModifier(mod));
registeredSkill.setName(mod, MMOUtils.caseOnWords(mod.toLowerCase().replace("-", " ").replace("_", " ")));
}
// Create ability data
AbilityData abilityData = new AbilityData(registeredSkill, TriggerType.API);
for (Object obj : event.getCast().getHandler().getModifiers()) {
String mod = obj.toString();
for (String mod : event.getCast().getHandler().getModifiers())
abilityData.setModifier(mod, event.getMetadata().getModifier(mod));
}
// Find ability target
LivingEntity target = event.getMetadata().hasTargetEntity() && event.getMetadata().getTargetEntityOrNull() instanceof LivingEntity ?

2
src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java
View File

@ -134,7 +134,7 @@ public class ConfigManager implements Reloadable {
if (!abilities.getConfig().getKeys(true).contains("ability." + path))
abilities.getConfig().set("ability." + path, ability.getName());
for (String modifier : ((SkillHandler<?>) ability.getHandler()).getModifiers())
for (String modifier : ability.getHandler().getModifiers())
if (!abilities.getConfig().getKeys(true).contains("modifier." + modifier))
abilities.getConfig().set("modifier." + modifier, MMOUtils.caseOnWords(modifier.replace("-", " ")));
}

17
src/main/java/net/Indyuce/mmoitems/manager/PluginUpdateManager.java
View File

@ -1,5 +1,7 @@
package net.Indyuce.mmoitems.manager;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.skill.handler.SkillHandler;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.ConfigFile;
import net.Indyuce.mmoitems.api.PluginUpdate;
@ -246,6 +248,21 @@ public class PluginUpdateManager {
sender.sendMessage("Config updates successfully applied, reloading skills..");
MMOItems.plugin.getSkills().initialize(true);
}));
register(new PluginUpdate(7, new String[]{"MI 6.7 introduced a 'timer' skill modifier for all skills.",
"This update registers that modifier in every of your skills.",
"Has to be ran after &6/mi update apply 6&7."}, sender -> {
for (SkillHandler<?> handler : MythicLib.plugin.getSkills().getHandlers()) {
ConfigFile config = new ConfigFile("/skill", handler.getLowerCaseId());
config.getConfig().set("modifier.timer.name", "Timer");
config.getConfig().set("modifier.timer.default-value", 0d);
config.save();
}
sender.sendMessage("Config updates successfully applied, reloading skills..");
MMOItems.plugin.getSkills().initialize(true);
}));
}
public void register(PluginUpdate update) {

3
src/main/java/net/Indyuce/mmoitems/skill/RegisteredSkill.java
View File

@ -1,6 +1,5 @@
package net.Indyuce.mmoitems.skill;
import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.skill.handler.SkillHandler;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
@ -24,7 +23,7 @@ public class RegisteredSkill {
this.name = Objects.requireNonNull(config.getString("name"), "Could not fill skill name");
for (String mod : handler.getModifiers()) {
modifierNames.put(mod, config.getString("modifier." + mod + ".name", UtilityMethods.caseOnWords(mod.replace("-", " "))));
modifierNames.put(mod, Objects.requireNonNull(config.getString("modifier." + mod + ".name"), "Could not find translation for modifier '" + mod + "'"));
modifierDefaultValues.put(mod, config.getDouble("modifier." + mod + ".default-value"));
}
}