From 2c96424dac5ac0c8fcacaf50090dafbfacc52e3b Mon Sep 17 00:00:00 2001 From: Gunging <48371009+Gunging@users.noreply.github.com> Date: Sat, 6 Nov 2021 20:07:06 -0500 Subject: [PATCH] Working with Refreshed MythicLib --- pom.xml | 4 ++-- src/main/java/net/Indyuce/mmocore/MMOCore.java | 1 - src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java | 2 +- .../net/Indyuce/mmocore/api/player/stats/PlayerStats.java | 2 +- .../net/Indyuce/mmocore/manager/data/PlayerDataManager.java | 2 +- src/main/java/net/Indyuce/mmocore/skill/CasterMetadata.java | 2 +- src/main/java/net/Indyuce/mmocore/skill/list/Fire_Rage.java | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e9730ddf..65b6b18e 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ org.spigotmc - spigot-1.17 + spigot-1.17.1 dev provided @@ -125,7 +125,7 @@ io.lumine MythicLib - 1.1.4 + 1.1.5 provided diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index 6bbae7d7..3dfa9651 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -97,7 +97,6 @@ public class MMOCore extends LuminePlugin { } public void load() { - // Register target restrictions due to MMOCore in MythicLib MythicLib.plugin.getEntities().registerRestriction(new MMOCoreTargetRestriction()); diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index c5ba3cdc..4851a39f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.api.player; -import io.lumine.mythic.lib.player.MMOPlayerData; +import io.lumine.mythic.lib.api.player.MMOPlayerData; import io.lumine.mythic.lib.player.cooldown.CooldownInfo; import io.lumine.mythic.lib.player.cooldown.CooldownMap; import net.Indyuce.mmocore.MMOCore; diff --git a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java index a0be9d26..9f9438f3 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.api.player.stats; -import io.lumine.mythic.lib.player.EquipmentSlot; +import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.stat.StatInstance; import io.lumine.mythic.lib.api.stat.StatMap; import io.lumine.mythic.lib.api.stat.modifier.ModifierSource; diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java index 322d7e05..ba16a9dd 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.manager.data; -import io.lumine.mythic.lib.player.MMOPlayerData; +import io.lumine.mythic.lib.api.player.MMOPlayerData; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.event.AsyncPlayerDataLoadEvent; import net.Indyuce.mmocore.api.event.PlayerDataLoadEvent; diff --git a/src/main/java/net/Indyuce/mmocore/skill/CasterMetadata.java b/src/main/java/net/Indyuce/mmocore/skill/CasterMetadata.java index f29f303e..573a092b 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/CasterMetadata.java +++ b/src/main/java/net/Indyuce/mmocore/skill/CasterMetadata.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.skill; import io.lumine.mythic.lib.MythicLib; -import io.lumine.mythic.lib.player.EquipmentSlot; +import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.stat.StatMap; import io.lumine.mythic.lib.damage.AttackMetadata; import io.lumine.mythic.lib.damage.DamageMetadata; diff --git a/src/main/java/net/Indyuce/mmocore/skill/list/Fire_Rage.java b/src/main/java/net/Indyuce/mmocore/skill/list/Fire_Rage.java index c3403522..ca3e5b66 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/list/Fire_Rage.java +++ b/src/main/java/net/Indyuce/mmocore/skill/list/Fire_Rage.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.skill.list; import io.lumine.mythic.lib.MythicLib; -import io.lumine.mythic.lib.player.EquipmentSlot; +import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.stat.StatMap; import io.lumine.mythic.lib.damage.DamageType; import io.lumine.mythic.lib.version.VersionMaterial;