From a9809dbccb801e1d657566f0b6ccbe55e18cef42 Mon Sep 17 00:00:00 2001 From: Jules Date: Sun, 10 Oct 2021 17:39:56 +0200 Subject: [PATCH 1/7] fixed NPE when interacting with NPC's --- .../Indyuce/mmocore/api/player/PlayerData.java | 16 ++++++++++++++++ .../mmocore/comp/MMOCoreTargetRestriction.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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 3fe3c74b..927dedf1 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -883,6 +883,22 @@ public class PlayerData extends OfflinePlayerData { return MMOCore.plugin.dataProvider.getDataManager().get(uuid); } + /** + * This is used to check if the player data is loaded for a + * specific player. This might seem redundant because the given + * Player instance is linked to an online player, and data + * is always loaded for an online player. + *

+ * In fact a Player instance can be attached to a Citizens NPC + * which has no player data loaded hence this method + * + * @param player Either a real player or an NPC + * @return If player data for that player is loaded + */ + public static boolean has(Player player) { + return MMOCore.plugin.dataProvider.getDataManager().isLoaded(player.getUniqueId()); + } + public static Collection getAll() { return MMOCore.plugin.dataProvider.getDataManager().getLoaded(); } diff --git a/src/main/java/net/Indyuce/mmocore/comp/MMOCoreTargetRestriction.java b/src/main/java/net/Indyuce/mmocore/comp/MMOCoreTargetRestriction.java index 44dc5470..24c4ae8a 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/MMOCoreTargetRestriction.java +++ b/src/main/java/net/Indyuce/mmocore/comp/MMOCoreTargetRestriction.java @@ -11,7 +11,7 @@ public class MMOCoreTargetRestriction implements TargetRestriction { @Override public boolean canTarget(Player player, LivingEntity target, InteractionType interaction) { - if (interaction.isOffense() && target instanceof Player) { + if (interaction.isOffense() && target instanceof Player && PlayerData.has((Player) target)) { PlayerData targetData = PlayerData.get(target.getUniqueId()); // Check for the same party From 4c3c3c9dfe147e46c1acdc3765d5c24fd50839ff Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 1 Nov 2021 19:36:53 +0100 Subject: [PATCH 2/7] fixed quest objective doubling issue --- pom.xml | 2 +- .../mmocore/api/player/PlayerData.java | 32 ++++++++++++++++--- .../mmocore/api/quest/ObjectiveProgress.java | 4 ++- .../mmocore/api/quest/PlayerQuests.java | 22 ++++++------- .../Indyuce/mmocore/api/util/Closable.java | 15 +++++++++ .../manager/data/PlayerDataManager.java | 7 +++- .../data/mysql/MySQLPlayerDataManager.java | 7 ++-- .../data/yaml/YAMLPlayerDataManager.java | 5 ++- 8 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 src/main/java/net/Indyuce/mmocore/api/util/Closable.java diff --git a/pom.xml b/pom.xml index f308891d..e9730ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ io.lumine MythicLib - 1.1.3 + 1.1.4 provided 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 927dedf1..94f17fad 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -1,8 +1,8 @@ package net.Indyuce.mmocore.api.player; -import io.lumine.mythic.lib.api.player.MMOPlayerData; -import io.lumine.mythic.lib.player.CooldownInfo; -import io.lumine.mythic.lib.player.CooldownMap; +import io.lumine.mythic.lib.player.MMOPlayerData; +import io.lumine.mythic.lib.player.cooldown.CooldownInfo; +import io.lumine.mythic.lib.player.cooldown.CooldownMap; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.Waypoint; @@ -19,6 +19,7 @@ import net.Indyuce.mmocore.api.player.social.guilds.Guild; import net.Indyuce.mmocore.api.player.stats.PlayerStats; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.quest.PlayerQuests; +import net.Indyuce.mmocore.api.util.Closable; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; import net.Indyuce.mmocore.experience.EXPSource; @@ -45,7 +46,7 @@ import java.util.*; import java.util.logging.Level; -public class PlayerData extends OfflinePlayerData { +public class PlayerData extends OfflinePlayerData implements Closable { /** * Corresponds to the MythicLib player data. It is used to keep @@ -127,6 +128,11 @@ public class PlayerData extends OfflinePlayerData { } } + @Override + public void close() { + questData.close(); + } + public MMOPlayerData getMMOPlayerData() { return mmoData; } @@ -896,7 +902,23 @@ public class PlayerData extends OfflinePlayerData { * @return If player data for that player is loaded */ public static boolean has(Player player) { - return MMOCore.plugin.dataProvider.getDataManager().isLoaded(player.getUniqueId()); + return has(player.getUniqueId()); + } + + /** + * This is used to check if the player data is loaded for a + * specific player. This might seem redundant because the given + * Player instance is linked to an online player, and data + * is always loaded for an online player. + *

+ * In fact a Player instance can be attached to a Citizens NPC + * which has no player data loaded hence this method + * + * @param uuid A (real or fictive) player UUID + * @return If player data for that player is loaded + */ + public static boolean has(UUID uuid) { + return MMOCore.plugin.dataProvider.getDataManager().isLoaded(uuid); } public static Collection getAll() { diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java b/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java index cb747478..92e56216 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java @@ -1,5 +1,6 @@ package net.Indyuce.mmocore.api.quest; +import net.Indyuce.mmocore.api.util.Closable; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; @@ -8,7 +9,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.objective.Objective; -public abstract class ObjectiveProgress { +public abstract class ObjectiveProgress implements Closable { private final Objective objective; private final QuestProgress questProgress; @@ -32,6 +33,7 @@ public abstract class ObjectiveProgress { return questProgress; } + @Override public void close() { if (this instanceof Listener) HandlerList.unregisterAll((Listener) this); diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java b/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java index dbb3a980..37b66d9d 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java @@ -6,6 +6,7 @@ import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.util.Closable; import org.bukkit.NamespacedKey; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; @@ -19,7 +20,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; -public class PlayerQuests { +public class PlayerQuests implements Closable { private final PlayerData playerData; private final BossBar bossbar; private final Map finished = new HashMap<>(); @@ -36,12 +37,6 @@ public class PlayerQuests { bossbar.addPlayer(playerData.getPlayer()); } - @Deprecated - public PlayerQuests(PlayerData playerData, BossBar bar) { - this.playerData = playerData; - this.bossbar = bar; - } - public PlayerQuests load(ConfigurationSection config) { if (config.contains("current")) try { @@ -148,15 +143,20 @@ public class PlayerQuests { public void start(Quest quest) { - // close current objective progress if quest is active - if (hasCurrent()) - current.getProgress().close(); + // Close current objective progress if quest is active + close(); - // apply newer quest + // Apply newest quest current = quest == null ? null : quest.generateNewProgress(playerData); updateBossBar(); } + @Override + public void close() { + if (current != null) + current.getProgress().close(); + } + public boolean checkCooldownAvailability(Quest quest) { return (finished.get(quest.getId()) + quest.getDelayMillis()) < System.currentTimeMillis(); } diff --git a/src/main/java/net/Indyuce/mmocore/api/util/Closable.java b/src/main/java/net/Indyuce/mmocore/api/util/Closable.java new file mode 100644 index 00000000..4b5283f3 --- /dev/null +++ b/src/main/java/net/Indyuce/mmocore/api/util/Closable.java @@ -0,0 +1,15 @@ +package net.Indyuce.mmocore.api.util; + +/** + * Indicates that a class temporarily registers something + * such as a Bukkit event, which needs to be unregistered + * when the class is finally garbage collected. + */ +public interface Closable { + + /** + * Method that must be called before the class + * is garbage collected + */ + void close(); +} 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 27294614..e9a8cc7e 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java @@ -34,7 +34,12 @@ public abstract class PlayerDataManager { return Objects.requireNonNull(data.get(uuid), "Player data is not loaded"); } - public void remove(UUID uuid) { + /** + * Clears the data map from a certain key + * + * @param uuid Player UUID to clear + */ + protected void unregisterData(UUID uuid) { data.remove(uuid); } diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java index 9383b1e4..ddde0b4a 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java @@ -238,7 +238,10 @@ public class MySQLPlayerDataManager extends PlayerDataManager { @Override public void remove(PlayerData data) { - if (data.isFullyLoaded()) saveData(data); - remove(data.getUniqueId()); + if (data.isFullyLoaded()) + saveData(data); + + data.close(); + unregisterData(data.getUniqueId()); } } diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java index cc0e4f4b..baf7b9ad 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java @@ -129,5 +129,8 @@ public class YAMLPlayerDataManager extends PlayerDataManager { } @Override - public void remove(PlayerData data) {} + public void remove(PlayerData data) { + data.close(); + unregisterData(data.getUniqueId()); + } } From d54ca50451e46aca407b8a8b6f05cde37aae4cc3 Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 1 Nov 2021 19:42:41 +0100 Subject: [PATCH 3/7] fixed quest objective doubling issue --- .../Indyuce/mmocore/api/player/PlayerData.java | 6 ++++++ .../Indyuce/mmocore/listener/PlayerListener.java | 5 +---- .../mmocore/manager/data/PlayerDataManager.java | 16 ++++++++++------ .../data/mysql/MySQLPlayerDataManager.java | 9 --------- .../manager/data/yaml/YAMLPlayerDataManager.java | 6 ------ 5 files changed, 17 insertions(+), 25 deletions(-) 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 94f17fad..c5ba3cdc 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -130,6 +130,12 @@ public class PlayerData extends OfflinePlayerData implements Closable { @Override public void close() { + + // Remove from party + if (hasParty()) + getParty().removeMember(this); + + // Close quest data questData.close(); } diff --git a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java index 15f2b825..fd9ad9de 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java @@ -67,10 +67,7 @@ public class PlayerListener implements Listener { @EventHandler public void e(PlayerQuitEvent event) { PlayerData playerData = PlayerData.get(event.getPlayer()); - if (playerData.hasParty()) - playerData.getParty().removeMember(playerData); - - MMOCore.plugin.dataProvider.getDataManager().remove(playerData); + MMOCore.plugin.dataProvider.getDataManager().unregisterSafe(playerData); } /** 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 e9a8cc7e..322d7e05 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java @@ -35,12 +35,18 @@ public abstract class PlayerDataManager { } /** - * Clears the data map from a certain key + * Safely unregisters the player data from the map. + * This saves the player data either through SQL or YAML, + * then closes the player data and clears it from the data map. * - * @param uuid Player UUID to clear + * @param playerData PLayer data to unregister */ - protected void unregisterData(UUID uuid) { - data.remove(uuid); + public void unregisterSafe(PlayerData playerData) { + if (playerData.isFullyLoaded()) + saveData(playerData); + + playerData.close(); + this.data.remove(playerData.getUniqueId()); } /** @@ -119,8 +125,6 @@ public abstract class PlayerDataManager { */ public abstract void saveData(PlayerData data); - public abstract void remove(PlayerData data); - public static class DefaultPlayerData { private final int level, classPoints, skillPoints, attributePoints, attrReallocPoints; diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java index ddde0b4a..2d116970 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java @@ -235,13 +235,4 @@ public class MySQLPlayerDataManager extends PlayerDataManager { return lastLogin; } } - - @Override - public void remove(PlayerData data) { - if (data.isFullyLoaded()) - saveData(data); - - data.close(); - unregisterData(data.getUniqueId()); - } } diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java index baf7b9ad..21bca359 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java @@ -127,10 +127,4 @@ public class YAMLPlayerDataManager extends PlayerDataManager { public OfflinePlayerData getOffline(UUID uuid) { return isLoaded(uuid) ? get(uuid) : new YAMLOfflinePlayerData(uuid); } - - @Override - public void remove(PlayerData data) { - data.close(); - unregisterData(data.getUniqueId()); - } } From e59b4d2db06cafe35068cd9238e762b89e4038a3 Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 1 Nov 2021 19:47:33 +0100 Subject: [PATCH 4/7] fixed command imports --- .../net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java | 4 ++-- .../net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java | 4 ++-- .../net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java | 4 ++-- .../Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java | 2 +- .../mmocore/command/rpg/admin/AdminCommandTreeNode.java | 2 +- .../mmocore/command/rpg/admin/AttributeCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/ClassCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/ExperienceCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/ForceClassCommandTreeNode.java | 4 ++-- .../command/rpg/admin/HideActionBarCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/InfoCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/LevelCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/PointsCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/ResetCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/admin/ResourceCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/booster/BoosterCommandTreeNode.java | 2 +- .../mmocore/command/rpg/booster/CreateCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/booster/ListCommandTreeNode.java | 2 +- .../mmocore/command/rpg/booster/RemoveCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/debug/DebugCommandTreeNode.java | 2 +- .../command/rpg/debug/StatModifiersCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/debug/StatValueCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/quest/CancelCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/quest/QuestCommandTreeNode.java | 2 +- .../mmocore/command/rpg/quest/StartCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/waypoint/OpenCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java | 4 ++-- .../mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java | 4 ++-- .../command/rpg/waypoint/WaypointsCommandTreeNode.java | 2 +- 30 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java index 6729bf0d..70ed75bc 100644 --- a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java +++ b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeRoot; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeRoot; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.command.rpg.CoinsCommandTreeNode; import net.Indyuce.mmocore.command.rpg.NoteCommandTreeNode; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java index 048121db..fc8f2636 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java @@ -1,8 +1,8 @@ package net.Indyuce.mmocore.command.rpg; import io.lumine.mythic.lib.api.util.SmartGive; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; import net.Indyuce.mmocore.api.util.item.CurrencyItem; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java index 28bfc48e..19b85802 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java @@ -9,8 +9,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.util.item.CurrencyItem; import io.lumine.mythic.lib.api.util.SmartGive; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class NoteCommandTreeNode extends CommandTreeNode { public NoteCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java index 5ea545bf..6cf499d0 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class ReloadCommandTreeNode extends CommandTreeNode { public ReloadCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java index 3d323a13..5db6d11c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; import org.bukkit.command.CommandSender; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java index c0e7f784..4679d447 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class AttributeCommandTreeNode extends CommandTreeNode { public AttributeCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java index 5c1e37cb..a2c122fc 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; import net.Indyuce.mmocore.command.CommandVerbose; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class ClassCommandTreeNode extends CommandTreeNode { public ClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java index 2625695c..9c3f0db7 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.CommandVerbose; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class ExperienceCommandTreeNode extends CommandTreeNode { public ExperienceCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java index 481fab16..58cdccc2 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java @@ -9,8 +9,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class ForceClassCommandTreeNode extends CommandTreeNode { public ForceClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java index d337dc79..bee42779 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class HideActionBarCommandTreeNode extends CommandTreeNode { public HideActionBarCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java index 7a9c1081..03c6928e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class InfoCommandTreeNode extends CommandTreeNode { public InfoCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java index 4f9c480c..7d3d8dee 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.experience.PlayerProfessions; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class LevelCommandTreeNode extends CommandTreeNode { public LevelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java index d573123e..29698e91 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class NoCooldownCommandTreeNode extends CommandTreeNode { public NoCooldownCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java index 3daf0dc2..8ef7c449 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class PointsCommandTreeNode extends CommandTreeNode { private final String type; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java index 9d96d8c6..c79b489f 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; import net.Indyuce.mmocore.command.CommandVerbose; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class ResetCommandTreeNode extends CommandTreeNode { public ResetCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java index fb16b352..94f440ad 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java index 59d6362a..e837758c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.booster; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class BoosterCommandTreeNode extends CommandTreeNode { public BoosterCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java index b06865f5..09ad2d68 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.experience.Booster; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class CreateCommandTreeNode extends CommandTreeNode { public CreateCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java index 11ff1c0f..55da16af 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java @@ -8,7 +8,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Booster; import net.Indyuce.mmocore.api.util.math.format.DelayFormat; import io.lumine.mythic.lib.MythicLib; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class ListCommandTreeNode extends CommandTreeNode { public ListCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java index 3f989c0f..08801ec2 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Booster; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class RemoveCommandTreeNode extends CommandTreeNode { public RemoveCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java index cf2a5ca9..c488afb7 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.debug; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class DebugCommandTreeNode extends CommandTreeNode { public static final String commandPrefix = ChatColor.YELLOW + "[" + ChatColor.RED + "DEBUG" + ChatColor.GOLD + "] " + ChatColor.RESET; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java index be5aaef6..f683e022 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java @@ -2,8 +2,8 @@ package net.Indyuce.mmocore.command.rpg.debug; import io.lumine.mythic.lib.api.stat.StatInstance; import io.lumine.mythic.lib.api.stat.modifier.StatModifier; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; import org.bukkit.ChatColor; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java index f99681dc..dc4683a5 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class StatValueCommandTreeNode extends CommandTreeNode { public StatValueCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java index 60b4b617..8d38c1fb 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class CancelCommandTreeNode extends CommandTreeNode { public CancelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java index d3fb4eb0..af309db8 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.quest; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class QuestCommandTreeNode extends CommandTreeNode { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java index 868a4adf..e56e853e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.Quest; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class StartCommandTreeNode extends CommandTreeNode { public StartCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java index f4b818ef..7db30c5d 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.manager.InventoryManager; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class OpenCommandTreeNode extends CommandTreeNode { public OpenCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java index a6f4ca96..1a79f48b 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.waypoint; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.Waypoint; import org.bukkit.Bukkit; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java index 50eac9c5..4a09e359 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.Waypoint; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; -import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.Parameter; public class UnlockCommandTreeNode extends CommandTreeNode { public UnlockCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java index 2c426760..5ef0090a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.waypoint; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; public class WaypointsCommandTreeNode extends CommandTreeNode { public WaypointsCommandTreeNode(CommandTreeNode parent) { 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 5/7] 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; From 8bb3d70a84ec57421012a7f0374f078fe6d6a062 Mon Sep 17 00:00:00 2001 From: Gunging <48371009+Gunging@users.noreply.github.com> Date: Sun, 7 Nov 2021 14:07:06 -0600 Subject: [PATCH 6/7] Increased version number --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65b6b18e..b9659997 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.Indyuce MMOCore - 1.8.1 + 1.8.2 MMOCore Offer your players a brand new RPG experience!! From f38cc59ec344e7aa3bb4d8ed380aeb462091cc7a Mon Sep 17 00:00:00 2001 From: Ashijin Date: Fri, 12 Nov 2021 03:16:33 +0000 Subject: [PATCH 7/7] Add LICENSE --- LICENSE | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..a8f19af1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,5 @@ +This project is owned and maintained by Lumine LLC and is distributed with "All Right's Reserved". + +This is just to protect the project and its status as a Paid Resource. + +You can fork and modify the project as you wish to meet your server's needs, and merge requests are accepted under the terms that you grant full rights to us using any pushed code. However, you may not distribute the plugin and may not bypass any anti-piracy protection.