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

Updated to MM 5.6 API

Browse Source
This commit is contained in:
Jules 2024-01-06 17:41:02 +01:00
parent 0559ead389
commit 5117c77229
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java
View File

@ -7,7 +7,7 @@ import io.lumine.mythic.bukkit.events.MythicReloadedEvent;
import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.player.PlayerData; import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsArrowVolleyMechanic; import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsArrowVolleyMechanic;
import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsOnShootAura; import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsOnUseAura;
import net.Indyuce.mmoitems.comp.mythicmobs.stat.FactionDamage; import net.Indyuce.mmoitems.comp.mythicmobs.stat.FactionDamage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -34,17 +34,22 @@ public class MythicMobsCompatibility implements Listener {
Bukkit.getPluginManager().registerEvents(this, MMOItems.plugin); Bukkit.getPluginManager().registerEvents(this, MMOItems.plugin);
} }
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void b(MythicMechanicLoadEvent event) { public void b(MythicMechanicLoadEvent event) {
// Switch Mechanic ig // Switch Mechanic ig
switch (event.getMechanicName().toLowerCase()) { switch (event.getMechanicName().toLowerCase()) {
case "mmoitemsvolley": case "mmoitemsvolley":
event.register(new MMOItemsArrowVolleyMechanic(event.getContainer().getManager(), event.getContainer().getFile(), event.getContainer().getConfigLine(), event.getConfig())); event.register(new MMOItemsArrowVolleyMechanic(event.getContainer().getManager(),
event.getContainer().getFile(),
event.getConfig().getLine(),
event.getConfig()));
break; break;
case "onmmoitemuse": case "onmmoitemuse":
event.register(new MMOItemsOnShootAura(event.getContainer().getManager(), event.getContainer().getFile(), event.getContainer().getConfigLine(), event.getConfig())); event.register(new MMOItemsOnUseAura(event.getContainer().getManager(),
event.getContainer().getFile(),
event.getConfig().getLine(),
event.getConfig()));
break; break;
default: default:
break; break;

8
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnShootAura.java → MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnUseAura.java
View File

@ -31,7 +31,7 @@ import java.util.Optional;
* *
* @author Gunging * @author Gunging
*/ */
public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill { public class MMOItemsOnUseAura extends Aura implements ITargetedEntitySkill {
@NotNull @NotNull
PlaceholderString skillName; PlaceholderString skillName;
@NotNull @NotNull
@ -44,7 +44,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill {
@NotNull @NotNull
final ArrayList<UseItemTypes> auraWeapons = new ArrayList<>(); final ArrayList<UseItemTypes> auraWeapons = new ArrayList<>();
public MMOItemsOnShootAura(SkillExecutor manager, File file, String line, MythicLineConfig mlc) { public MMOItemsOnUseAura(SkillExecutor manager, File file, String line, MythicLineConfig mlc) {
super(manager, file, line, mlc); super(manager, file, line, mlc);
skillName = mlc.getPlaceholderString(new String[]{"skill", "s", "ondamagedskill", "ondamaged", "od", "onhitskill", "onhit", "oh", "meta", "m", "mechanics", "$", "()"}, "skill not found"); skillName = mlc.getPlaceholderString(new String[]{"skill", "s", "ondamagedskill", "ondamaged", "od", "onhitskill", "onhit", "oh", "meta", "m", "mechanics", "$", "()"}, "skill not found");
@ -109,7 +109,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill {
caster = new GenericCaster(target); caster = new GenericCaster(target);
} }
new MMOItemsOnShootAura.Tracker(caster, data, target); new MMOItemsOnUseAura.Tracker(caster, data, target);
return SkillResult.SUCCESS; return SkillResult.SUCCESS;
} }
@ -169,7 +169,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill {
} }
})); }));
this.executeAuraSkill(MMOItemsOnShootAura.this.onStartSkill, this.skillMetadata); this.executeAuraSkill(MMOItemsOnUseAura.this.onStartSkill, this.skillMetadata);
} }
} }