Merge remote-tracking branch 'origin/master'

# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/LockCommandTreeNode.java

LICENSE

@@ -1,5 +1,3 @@
-This project is owned and maintained by Lumine LLC and is distributed with "All Right's Reserved".
+This project is owned and maintained by PhoenixDvpt 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 source code of this 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 for any purpose other than providing cross-compatibility with other Minecraft plugins, and may not bypass any anti-piracy protection.

MMOCore-API/pom.xml

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>MMOCore</artifactId>
+        <groupId>net.Indyuce</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>MMOCore-API</artifactId>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+    </properties>
+
+    <build>
+        <finalName>${project.name}-${project.version}</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <defaultGoal>clean package install</defaultGoal>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>io.papermc.lib</pattern>
+                                    <shadedPattern>net.Indyuce.mmocore.paperlib</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+            This flattens the pom.xml from the API module as well so that it can be uploaded
+            to Nexus. For plugins which have no API/Bukkit differenciation like MythicLib we
+            can just use the main plugin pom.xml file.
+            -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+    <repositories>
+
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
+
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/repository/public/</url>
+        </repository>
+
+    </repositories>
+
+    <dependencies>
+
+        <!-- Spigot API -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-1.17.1</artifactId>
+            <version>dev</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Extra libs -->
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.5</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Plugin dependencies -->
+        <dependency>
+            <groupId>io.lumine</groupId>
+            <artifactId>MythicLib-dist</artifactId>
+            <version>1.3.4-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.lumine</groupId>
+            <artifactId>Mythic-Dist</artifactId>
+            <version>5.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.9.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.2-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.8.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.citizensnpcs</groupId>
+            <artifactId>Citizens</artifactId>
+            <version>2.0.25</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Party plugins -->
+        <dependency>
+            <groupId>de.simonsator</groupId>
+            <artifactId>PartyAndFriends</artifactId>
+            <version>1.0.65</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alessiodp</groupId>
+            <artifactId>Parties</artifactId>
+            <version>3.1.14</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.gmail.nossr50</groupId>
+            <artifactId>mcMMO</artifactId>
+            <version>2.1.209</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>de.erethon</groupId>
+            <artifactId>DungeonsXL</artifactId>
+            <version>0.18-PRE-02</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.denizen</groupId>
+            <artifactId>Dungeons</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Quest Plugins -->
+        <dependency>
+            <groupId>me.blackvein</groupId>
+            <artifactId>Quests</artifactId>
+            <version>4.4.1-b340</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>fr.skytasul.quests</groupId>
+            <artifactId>BeautyQuests</artifactId>
+            <version>0.19.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.guillaumevdn</groupId>
+            <artifactId>QuestCreator</artifactId>
+            <version>6.39.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.guillaumevdn</groupId>
+            <artifactId>GCore</artifactId>
+            <version>8.39.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Guild plugins -->
+        <dependency>
+            <groupId>com.massivecraft</groupId>
+            <artifactId>Factions</artifactId>
+            <version>1.6.9.5-2.9.8-RC</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.ulrich</groupId>
+            <artifactId>UltimateClans</artifactId>
+            <version>4.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.glaremasters</groupId>
+            <artifactId>Guilds</artifactId>
+            <version>3.5.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.kingdoms.main</groupId>
+            <artifactId>Kingdoms</artifactId>
+            <version>1.11.15.0.0.0.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

MMOCore-API/src/main/java/net/Indyuce/mmocore/MMOCore.java

@@ -3,9 +3,10 @@ package net.Indyuce.mmocore;
 import io.lumine.mythic.lib.MythicLib;
 import io.lumine.mythic.lib.UtilityMethods;
 import io.lumine.mythic.lib.version.SpigotPlugin;
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.manager.social.PartyManager;
 import net.Indyuce.mmocore.api.ConfigFile;
 import net.Indyuce.mmocore.api.PlayerActionBar;
-import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.attribute.AttributeModifier;
 import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
 import net.Indyuce.mmocore.command.*;
@@ -26,18 +27,12 @@ import net.Indyuce.mmocore.guild.GuildModule;
 import net.Indyuce.mmocore.guild.GuildModuleType;
 import net.Indyuce.mmocore.guild.provided.Guild;
 import net.Indyuce.mmocore.guild.provided.MMOCoreGuildModule;
-import net.Indyuce.mmocore.listener.*;
-import net.Indyuce.mmocore.listener.event.PlayerPressKeyListener;
-import net.Indyuce.mmocore.listener.option.*;
-import net.Indyuce.mmocore.listener.profession.FishingListener;
-import net.Indyuce.mmocore.listener.profession.PlayerCollectStats;
 import net.Indyuce.mmocore.manager.*;
 import net.Indyuce.mmocore.manager.data.DataProvider;
 import net.Indyuce.mmocore.manager.data.mysql.MySQLDataProvider;
 import net.Indyuce.mmocore.manager.data.yaml.YAMLDataProvider;
 import net.Indyuce.mmocore.manager.profession.*;
 import net.Indyuce.mmocore.manager.social.BoosterManager;
-import net.Indyuce.mmocore.manager.social.PartyManager;
 import net.Indyuce.mmocore.manager.social.RequestManager;
 import net.Indyuce.mmocore.party.MMOCoreTargetRestriction;
 import net.Indyuce.mmocore.party.PartyModule;
@@ -208,9 +203,6 @@ public class MMOCore extends JavaPlugin {
 
         initializePlugin(false);
 
-        if (getConfig().getBoolean("vanilla-exp-redirection.enabled"))
-            Bukkit.getPluginManager().registerEvents(new RedirectVanillaExp(getConfig().getDouble("vanilla-exp-redirection.ratio")), this);
-
         // Load party module
         try {
             String partyPluginName = UtilityMethods.enumName(getConfig().getString("party-plugin"));
@@ -241,35 +233,12 @@ public class MMOCore extends JavaPlugin {
             getLogger().log(Level.WARNING, "Could not load skill casting: " + exception.getMessage());
         }
 
-        if (configManager.overrideVanillaExp = getConfig().getBoolean("override-vanilla-exp"))
+        // Load MMOCore-Bukkit module
-            Bukkit.getPluginManager().registerEvents(new VanillaExperienceOverride(), this);
+        try {
-
+            Class.forName("net.Indyuce.mmocore.MMOCoreBukkit").getConstructor(MMOCore.class).newInstance(this);
-        if (getConfig().getBoolean("hotbar-swapping.enabled"))
+        } catch(Throwable exception) {
-            try {
+            throw new RuntimeException("Cannot run an API build on Spigot!");
-                Bukkit.getPluginManager().registerEvents(new HotbarSwap(getConfig().getConfigurationSection("hotbar-swapping")), this);
+        }
-            } catch (RuntimeException exception) {
-                getLogger().log(Level.WARNING, "Could not load hotbar swapping: " + exception.getMessage());
-            }
-
-        if (getConfig().getBoolean("prevent-spawner-xp"))
-            Bukkit.getPluginManager().registerEvents(new NoSpawnerEXP(), this);
-
-        if (getConfig().getBoolean("death-exp-loss.enabled"))
-            Bukkit.getPluginManager().registerEvents(new DeathExperienceLoss(), this);
-
-        if (getConfig().getBoolean("shift-click-player-profile-check"))
-            Bukkit.getPluginManager().registerEvents(new PlayerProfileCheck(), this);
-
-        Bukkit.getPluginManager().registerEvents(new WaypointsListener(), this);
-        Bukkit.getPluginManager().registerEvents(new PlayerListener(), this);
-        Bukkit.getPluginManager().registerEvents(new GoldPouchesListener(), this);
-        Bukkit.getPluginManager().registerEvents(new BlockListener(), this);
-        Bukkit.getPluginManager().registerEvents(new LootableChestsListener(), this);
-        Bukkit.getPluginManager().registerEvents(new GuildListener(), this);
-        Bukkit.getPluginManager().registerEvents(new FishingListener(), this);
-        Bukkit.getPluginManager().registerEvents(new PlayerCollectStats(), this);
-        Bukkit.getPluginManager().registerEvents(new PlayerPressKeyListener(), this);
-        // Bukkit.getPluginManager().registerEvents(new ClassTriggers(), this);
 
         /*
          * Initialize player data from all online players. This is very important to do

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/MMOCoreAPI.java

@@ -6,11 +6,11 @@ import io.lumine.mythic.lib.skill.handler.SkillHandler;
 import io.lumine.mythic.lib.skill.result.SkillResult;
 import io.lumine.mythic.lib.skill.trigger.TriggerMetadata;
 import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.party.AbstractParty;
 import net.Indyuce.mmocore.skill.CastableSkill;
 import net.Indyuce.mmocore.skill.ClassSkill;
 import net.Indyuce.mmocore.skill.RegisteredSkill;
-import net.Indyuce.mmocore.api.player.PlayerData;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java

@@ -5,7 +5,6 @@ import io.lumine.mythic.lib.manager.StatManager;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.player.PlayerActivity;
 import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.player.stats.StatInfo;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.attribute.Attribute;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java

@@ -6,8 +6,8 @@ import io.lumine.mythic.lib.api.condition.type.BlockCondition;
 import io.lumine.mythic.lib.api.condition.type.MMOCondition;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.quest.trigger.Trigger;
-import net.Indyuce.mmocore.loot.droptable.DropTable;
 import net.Indyuce.mmocore.loot.LootBuilder;
+import net.Indyuce.mmocore.loot.droptable.DropTable;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.block.Block;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java

@@ -1,10 +1,10 @@
 package net.Indyuce.mmocore.api.block;
 
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 
 import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
-import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import io.lumine.mythic.lib.MythicLib;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import io.lumine.mythic.lib.version.VersionMaterial;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java

@@ -5,6 +5,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.util.item.CurrencyItemBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -17,7 +18,6 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.util.item.CurrencyItemBuilder;
 import io.lumine.mythic.lib.api.util.SmartGive;
 
 public class Withdraw implements Listener {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/CustomBlockMineEvent.java

@@ -1,7 +1,7 @@
 package net.Indyuce.mmocore.api.event;
 
-import net.Indyuce.mmocore.api.block.BlockInfo;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.block.BlockInfo;
 import org.bukkit.block.Block;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/CustomPlayerFishEvent.java

@@ -1,11 +1,10 @@
 package net.Indyuce.mmocore.api.event;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 public class CustomPlayerFishEvent extends PlayerDataEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/LootChestSpawnEvent.java

@@ -1,11 +1,10 @@
 package net.Indyuce.mmocore.api.event;
 
-import org.bukkit.event.Cancellable;
+import net.Indyuce.mmocore.api.player.PlayerData;
-import org.bukkit.event.HandlerList;
-
 import net.Indyuce.mmocore.loot.LootBuilder;
 import net.Indyuce.mmocore.loot.chest.LootChest;
-import net.Indyuce.mmocore.api.player.PlayerData;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
 
 public class LootChestSpawnEvent extends PlayerDataEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/MMOCommandEvent.java

@@ -1,10 +1,9 @@
 package net.Indyuce.mmocore.api.event;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 /**
  * @deprecated Use Bukkit event instead
  */

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerChangeClassEvent.java

@@ -1,10 +1,9 @@
 package net.Indyuce.mmocore.api.event;
 
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.profess.PlayerClass;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
 
 public class PlayerChangeClassEvent extends PlayerDataEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerDataEvent.java

@@ -1,8 +1,7 @@
 package net.Indyuce.mmocore.api.event;
 
-import org.bukkit.event.player.PlayerEvent;
-
 import net.Indyuce.mmocore.api.player.PlayerData;
+import org.bukkit.event.player.PlayerEvent;
 
 public abstract class PlayerDataEvent extends PlayerEvent {
 	private final PlayerData playerData;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerExperienceGainEvent.java

@@ -2,12 +2,12 @@ package net.Indyuce.mmocore.api.event;
 
 import javax.annotation.Nullable;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.experience.EXPSource;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
 import net.Indyuce.mmocore.experience.Profession;
-import net.Indyuce.mmocore.api.player.PlayerData;
 
 public class PlayerExperienceGainEvent extends PlayerDataEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerLevelUpEvent.java

@@ -1,9 +1,9 @@
 package net.Indyuce.mmocore.api.event;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.experience.Profession;
 import org.bukkit.event.HandlerList;
 
-import net.Indyuce.mmocore.experience.Profession;
-import net.Indyuce.mmocore.api.player.PlayerData;
 import org.jetbrains.annotations.Nullable;
 
 public class PlayerLevelUpEvent extends PlayerDataEvent {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/PlayerResourceUpdateEvent.java

@@ -1,11 +1,11 @@
 package net.Indyuce.mmocore.api.event;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
 import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger;
 import net.Indyuce.mmocore.api.quest.trigger.StaminaTrigger;
 import net.Indyuce.mmocore.api.quest.trigger.StelliumTrigger;
 import net.Indyuce.mmocore.command.rpg.admin.ResourceCommandTreeNode;
-import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
 import net.Indyuce.mmocore.skill.list.Neptune_Gift;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/social/GuildChatEvent.java

@@ -1,11 +1,11 @@
 package net.Indyuce.mmocore.api.event.social;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.guild.provided.Guild;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
 import net.Indyuce.mmocore.api.event.PlayerDataEvent;
-import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.guild.provided.Guild;
 
 public class GuildChatEvent extends PlayerDataEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/event/social/PartyChatEvent.java

@@ -1,8 +1,8 @@
 package net.Indyuce.mmocore.api.event.social;
 
-import net.Indyuce.mmocore.api.event.PlayerDataEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.party.provided.Party;
+import net.Indyuce.mmocore.api.event.PlayerDataEvent;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java

@@ -1,14 +1,14 @@
 package net.Indyuce.mmocore.api.load;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
+import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
+import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.api.block.BlockType;
 import net.Indyuce.mmocore.api.block.SkullBlockType;
 import net.Indyuce.mmocore.api.block.VanillaBlockType;
 import net.Indyuce.mmocore.api.quest.objective.*;
 import net.Indyuce.mmocore.api.quest.trigger.*;
-import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
 import net.Indyuce.mmocore.experience.source.*;
-import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.loot.chest.condition.*;
 import net.Indyuce.mmocore.loot.droptable.dropitem.*;
 import org.bukkit.configuration.ConfigurationSection;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java

@@ -1,13 +1,13 @@
 package net.Indyuce.mmocore.api.load;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
-import net.Indyuce.mmocore.api.block.BlockType;
 import net.Indyuce.mmocore.api.quest.objective.Objective;
 import net.Indyuce.mmocore.api.quest.trigger.Trigger;
 import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
 import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.loot.chest.condition.Condition;
 import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;
+import net.Indyuce.mmocore.api.block.BlockType;
 import org.bukkit.configuration.ConfigurationSection;
 
 /**

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java

@@ -4,6 +4,7 @@ import io.lumine.mythic.lib.MythicLib;
 import io.lumine.mythic.lib.api.player.MMOPlayerData;
 import io.lumine.mythic.lib.player.cooldown.CooldownMap;
 import io.lumine.mythic.lib.player.modifier.PlayerModifier;
+import net.Indyuce.mmocore.party.provided.Party;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigMessage;
 import net.Indyuce.mmocore.api.SoundEvent;
@@ -31,7 +32,6 @@ import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
 import net.Indyuce.mmocore.guild.provided.Guild;
 import net.Indyuce.mmocore.loot.chest.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.party.AbstractParty;
-import net.Indyuce.mmocore.party.provided.Party;
 import net.Indyuce.mmocore.player.Unlockable;
 import net.Indyuce.mmocore.skill.ClassSkill;
 import net.Indyuce.mmocore.skill.RegisteredSkill;
@@ -59,7 +59,6 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.Nullable;
 import java.util.*;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 
 public class PlayerData extends OfflinePlayerData implements Closable, ExperienceTableClaimer {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java

@@ -3,10 +3,10 @@ package net.Indyuce.mmocore.api.player.attribute;
 import io.lumine.mythic.lib.MythicLib;
 import io.lumine.mythic.lib.api.stat.modifier.StatModifier;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.experience.EXPSource;
-import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.experience.EXPSource;
 import net.Indyuce.mmocore.experience.ExpCurve;
+import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
 import net.Indyuce.mmocore.experience.ExperienceObject;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java

@@ -25,7 +25,6 @@ import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.Indyuce.mmocore.experience.EXPSource;
 import net.Indyuce.mmocore.experience.ExpCurve;
-import net.Indyuce.mmocore.experience.ExperienceObject;
 import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
 import net.Indyuce.mmocore.loot.chest.particle.CastingParticle;
 import net.Indyuce.mmocore.player.stats.StatInfo;
@@ -33,6 +32,7 @@ import net.Indyuce.mmocore.skill.ClassSkill;
 import net.Indyuce.mmocore.skill.RegisteredSkill;
 import net.Indyuce.mmocore.skill.cast.KeyCombo;
 import net.Indyuce.mmocore.skill.cast.PlayerKey;
+import net.Indyuce.mmocore.experience.ExperienceObject;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/SavedClassInformation.java

@@ -6,6 +6,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute;
 import net.Indyuce.mmocore.manager.data.PlayerDataManager;
 import net.Indyuce.mmocore.skill.RegisteredSkill;
@@ -14,8 +15,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 public class SavedClassInformation {
 	private final int level, skillPoints, attributePoints, attributeReallocationPoints;
 	private final double experience;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/PlayerResource.java

@@ -1,9 +1,9 @@
 package net.Indyuce.mmocore.api.player.profess.resource;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.command.rpg.admin.ResourceCommandTreeNode;
 import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
 import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger;
-import net.Indyuce.mmocore.command.rpg.admin.ResourceCommandTreeNode;
-import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.profess.ClassOption;
 import org.bukkit.attribute.Attribute;
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ResourceRegeneration.java

@@ -1,7 +1,7 @@
 package net.Indyuce.mmocore.api.player.profess.resource;
 
-import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java

@@ -1,12 +1,12 @@
 package net.Indyuce.mmocore.api.quest;
 
+import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.util.Closable;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 
-import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.quest.objective.Objective;
 
 public abstract class ObjectiveProgress implements Closable {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java

@@ -7,14 +7,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 
+import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.quest.objective.Objective;
+import net.Indyuce.mmocore.experience.Profession;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 
-import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.experience.Profession;
-import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.quest.objective.Objective;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import io.lumine.mythic.lib.api.util.PostLoadObject;
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java

@@ -1,7 +1,7 @@
 package net.Indyuce.mmocore.api.quest.objective;
 
-import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
 import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
+import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
 import net.Indyuce.mmocore.api.quest.QuestProgress;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java

@@ -1,10 +1,10 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class CommandTrigger extends Trigger {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java

@@ -1,13 +1,13 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
+import net.Indyuce.mmocore.MMOCore;
+import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 import net.Indyuce.mmocore.experience.EXPSource;
 import net.Indyuce.mmocore.experience.SimpleExperienceObject;
 import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
 import org.apache.commons.lang.Validate;
 
-import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import org.jetbrains.annotations.NotNull;
 

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/FromTrigger.java

@@ -2,8 +2,8 @@ package net.Indyuce.mmocore.api.quest.trigger;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.ConfigFile;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.ConfigFile;
 import org.apache.commons.lang.Validate;
 
 import java.util.ArrayList;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java

@@ -1,9 +1,9 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
-import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
+import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
 
 public class ManaTrigger extends Trigger {
 	private final RandomAmount amount;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java

@@ -1,9 +1,9 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
-import org.bukkit.entity.Player;
-
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import org.bukkit.entity.Player;
+
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class MessageTrigger extends Trigger {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java

@@ -1,8 +1,8 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
+import net.Indyuce.mmocore.api.player.PlayerData;
 import org.bukkit.Sound;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
 import io.lumine.mythic.lib.api.MMOLineConfig;
 
 public class SoundTrigger extends Trigger {

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java

@@ -1,10 +1,10 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
-import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
 import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
+import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
+import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
 
 public class StaminaTrigger extends Trigger {
 	private final RandomAmount amount;

MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java

@@ -1,10 +1,10 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
 import io.lumine.mythic.lib.api.MMOLineConfig;
-import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
 import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
+import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
+import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
 
 public class StelliumTrigger extends Trigger {
 	private final RandomAmount amount;

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/AttributesCommand.java

@@ -1,7 +1,8 @@
 package net.Indyuce.mmocore.command;
 
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -9,8 +10,6 @@ import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 public class AttributesCommand extends BukkitCommand {
 	public AttributesCommand(ConfigurationSection config) {
 		super(config.getString("main"));

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/ClassCommand.java

@@ -1,7 +1,8 @@
 package net.Indyuce.mmocore.command;
 
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -9,8 +10,6 @@ import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 public class ClassCommand extends BukkitCommand {
 	public ClassCommand(ConfigurationSection config) {
 		super(config.getString("main"));

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/FriendsCommand.java

@@ -1,11 +1,11 @@
 package net.Indyuce.mmocore.command;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.social.FriendRequest;
-import net.Indyuce.mmocore.api.player.social.Request;
 import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
+import net.Indyuce.mmocore.api.player.social.Request;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/GuildCommand.java

@@ -1,11 +1,11 @@
 package net.Indyuce.mmocore.command;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import net.Indyuce.mmocore.api.player.social.Request;
 import net.Indyuce.mmocore.guild.provided.GuildInvite;
-import net.Indyuce.mmocore.manager.InventoryManager;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/PartyCommand.java

@@ -1,10 +1,10 @@
 package net.Indyuce.mmocore.command;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
-import net.Indyuce.mmocore.api.player.social.Request;
 import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
+import net.Indyuce.mmocore.api.player.social.Request;
 import net.Indyuce.mmocore.party.provided.MMOCorePartyModule;
 import net.Indyuce.mmocore.party.provided.PartyInvite;
 import org.apache.commons.lang.Validate;

MMOCore-API/src/main/java/net/Indyuce/mmocore/command/PlayerStatsCommand.java

@@ -1,7 +1,8 @@
 package net.Indyuce.mmocore.command;
 
-import net.Indyuce.mmocore.api.event.MMOCommandEvent;
+import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.manager.InventoryManager;
+import net.Indyuce.mmocore.api.event.MMOCommandEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -9,8 +10,6 @@ import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-import net.Indyuce.mmocore.api.player.PlayerData;
-
 public class PlayerStatsCommand extends BukkitCommand {
 	public PlayerStatsCommand(ConfigurationSection config) {
 		super(config.getString("main"));