diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java index fec437c2..e09cbe5c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java @@ -11,9 +11,9 @@ import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; -import net.Indyuce.mmocore.api.load.PostLoadObject; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.mmogroup.mmolib.api.MMOLineConfig; +import net.mmogroup.mmolib.api.util.PostLoadObject; public class DropTable extends PostLoadObject { private final String id; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java index e535c4b4..1db67786 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java @@ -10,10 +10,10 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.potion.PotionType; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.load.PostLoadObject; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.api.MMOLineConfig; +import net.mmogroup.mmolib.api.util.PostLoadObject; public class Profession extends PostLoadObject { private final String id, name; diff --git a/src/main/java/net/Indyuce/mmocore/api/load/PostLoadObject.java b/src/main/java/net/Indyuce/mmocore/api/load/PostLoadObject.java deleted file mode 100644 index cc8bedd4..00000000 --- a/src/main/java/net/Indyuce/mmocore/api/load/PostLoadObject.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.Indyuce.mmocore.api.load; - -import org.bukkit.configuration.ConfigurationSection; - -public abstract class PostLoadObject { - private ConfigurationSection config; - - /* - * objects which must load some data afterwards, like quests which must load - * their parent quests after all quests were initialized or classes which - * must load their subclasses - */ - public PostLoadObject(ConfigurationSection config) { - this.config = config; - } - - public void postLoad() { - whenPostLoaded(config); - - /* - * clean config object for garbage collection - */ - config = null; - } - - protected abstract void whenPostLoaded(ConfigurationSection config); -} \ No newline at end of file diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java index f8898f31..19d3fa93 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java @@ -26,7 +26,6 @@ import com.mojang.authlib.properties.Property; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.ExpCurve; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; -import net.Indyuce.mmocore.api.load.PostLoadObject; import net.Indyuce.mmocore.api.player.profess.event.EventTrigger; import net.Indyuce.mmocore.api.player.profess.resource.ManaDisplayOptions; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; @@ -40,6 +39,7 @@ import net.Indyuce.mmocore.api.util.math.particle.CastingParticle; import net.md_5.bungee.api.ChatColor; import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.api.MMOLineConfig; +import net.mmogroup.mmolib.api.util.PostLoadObject; import net.mmogroup.mmolib.version.VersionMaterial; public class PlayerClass extends PostLoadObject { diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java b/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java index cebb9e31..59415aaa 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java @@ -13,10 +13,10 @@ import org.bukkit.configuration.file.FileConfiguration; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.Profession; -import net.Indyuce.mmocore.api.load.PostLoadObject; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.objective.Objective; import net.mmogroup.mmolib.api.MMOLineConfig; +import net.mmogroup.mmolib.api.util.PostLoadObject; public class Quest extends PostLoadObject { private final String id; diff --git a/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java b/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java index df9eb78a..6adb9a8a 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; -import net.Indyuce.mmocore.api.player.profess.event.trigger.*; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -20,6 +19,12 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.ClassOption; import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.event.EventTriggerHandler; +import net.Indyuce.mmocore.api.player.profess.event.trigger.AttackEventTrigger; +import net.Indyuce.mmocore.api.player.profess.event.trigger.BlockBrokenTrigger; +import net.Indyuce.mmocore.api.player.profess.event.trigger.BlockPlacedTrigger; +import net.Indyuce.mmocore.api.player.profess.event.trigger.ClassChosenEventTrigger; +import net.Indyuce.mmocore.api.player.profess.event.trigger.LevelUpEventTrigger; +import net.Indyuce.mmocore.api.player.profess.event.trigger.MultipleLevelUpEventTrigger; public class ClassManager extends MMOManager { private final Map map = new HashMap<>(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java b/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java index dfbab78c..0c5b3533 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java @@ -12,8 +12,8 @@ import org.bukkit.configuration.file.FileConfiguration; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.block.BlockType; -import net.Indyuce.mmocore.api.load.PostLoadObject; import net.mmogroup.mmolib.api.MMOLineConfig; +import net.mmogroup.mmolib.api.util.PostLoadObject; public class RestrictionManager { // private Set breakBlackList = new HashSet<>();