Killing Dead Imports

bukkit/src/main/java/com/gmail/nossr50/mcMMO.java

@@ -26,7 +26,7 @@ import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.core.runnables.player.PowerLevelUpdatingTask;
 import com.gmail.nossr50.core.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.core.skills.child.ChildConfig;
+import com.gmail.nossr50.core.config.ChildConfig;
 import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable;
 import com.gmail.nossr50.core.skills.child.salvage.salvageables.SalvageableManager;
 import com.gmail.nossr50.core.skills.child.salvage.salvageables.SimpleSalvageableManager;

core/src/main/java/com/gmail/nossr50/core/TODO

@@ -15,4 +15,20 @@ This file is just going to take note of all the caveats of mcMMO code as I abstr
 
 7) Weird stuff going on with ageables and strings in general in StringUtils
 
-8) Reduce the amount of string operations in mcMMO as much as possible
+8) Reduce the amount of string operations in mcMMO as much as possible
+
+
+
+////////////
+
+CONFIG NOTES
+
+///////////
+
+1) All Config files need their validation redone and checked
+
+2) All Config files need unload programmed in
+
+3) All Config files need string operations reduced and to be double checked for errors in paths
+
+4) Need to setup removing old keys on configs

core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java → core/src/main/java/com/gmail/nossr50/core/config/ChildConfig.java

@@ -1,9 +1,8 @@
-package com.gmail.nossr50.core.skills.child;
+package com.gmail.nossr50.core.config;
 
-import com.gmail.nossr50.core.config.AutoUpdateConfigLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.configuration.file.YamlConfiguration;
+import com.gmail.nossr50.core.skills.child.FamilyTree;
+import com.gmail.nossr50.core.util.StringUtils;
 
 import java.util.EnumSet;
 

core/src/main/java/com/gmail/nossr50/core/config/Config.java

@@ -247,6 +247,8 @@ public abstract class Config implements VersionedConfig, Unload {
         if(mergeNewKeys)
             userRootNode = userRootNode.mergeValuesFrom(defaultRootNode);
 
+        removeOldKeys();
+
         // Update config version
         updateConfigVersion();
 

core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java

@@ -1,15 +1,11 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.McmmoCore;
-import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.config.ConfigKeyRegister;
-import com.gmail.nossr50.core.mcmmo.mods.CustomBlock;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
+import com.gmail.nossr50.core.datatypes.mods.CustomBlock;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 
 public class CustomBlockConfig extends ConfigKeyRegister {

core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java

@@ -1,12 +1,9 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.McmmoCore;
-import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.config.Config;
-import com.gmail.nossr50.core.mcmmo.mods.CustomEntity;
-import org.apache.commons.lang.ClassUtils;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.datatypes.mods.CustomEntity;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 import java.util.HashMap;
 

core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java

@@ -1,20 +1,15 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.McmmoCore;
-import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.config.Config;
-import com.gmail.nossr50.core.mcmmo.mods.CustomTool;
-import com.gmail.nossr50.core.mcmmo.skills.ItemType;
-import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
-import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.datatypes.mods.CustomTool;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
+import com.gmail.nossr50.core.skills.MaterialType;
+import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable;
+import com.gmail.nossr50.core.skills.primary.repair.repairables.RepairableFactory;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 

core/src/main/java/com/gmail/nossr50/core/config/mods/EntityConfigManager.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
+
+import com.gmail.nossr50.core.util.ModManager;
 
 import java.io.File;
 import java.util.regex.Pattern;

core/src/main/java/com/gmail/nossr50/core/config/mods/ToolConfigManager.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
+
+import com.gmail.nossr50.core.util.ModManager;
 
 import java.io.File;
 import java.util.regex.Pattern;

core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.mcmmo.colors.ChatColor;
 import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotion;
-import org.bukkit.configuration.ConfigurationSection;
 
 import java.util.ArrayList;
 import java.util.HashMap;

core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfigManager.java

@@ -1,7 +1,7 @@
-package com.gmail.nossr50.config.skills.repair;
+package com.gmail.nossr50.core.config.skills.repair;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import com.gmail.nossr50.core.config.skills.repair.RepairConfig;
+import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable;
 
 import java.io.File;
 import java.util.ArrayList;

core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java

@@ -1,17 +1,13 @@
-package com.gmail.nossr50.config.skills.salvage;
+package com.gmail.nossr50.core.config.skills.salvage;
 
-import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.core.McmmoCore;
 import com.gmail.nossr50.core.config.Config;
-import com.gmail.nossr50.core.mcmmo.skills.ItemType;
-import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
-import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
-import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
+import com.gmail.nossr50.core.skills.MaterialType;
+import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable;
+import com.gmail.nossr50.core.skills.child.salvage.salvageables.SalvageableFactory;
+import com.gmail.nossr50.core.util.ItemUtils;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManager.java

@@ -1,7 +1,8 @@
 package com.gmail.nossr50.core.data.blockmeta;
 
-import org.bukkit.World;
-import org.bukkit.block.Block;
+
+import com.gmail.nossr50.core.mcmmo.block.Block;
+import com.gmail.nossr50.core.mcmmo.world.World;
 
 public interface ChunkletManager {
     /**

core/src/main/java/com/gmail/nossr50/core/data/blockmeta/HashChunkletManager.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.data.blockmeta;
 
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.World;
-import org.bukkit.block.Block;
+import com.gmail.nossr50.core.mcmmo.block.Block;
+import com.gmail.nossr50.core.mcmmo.world.World;
 
 import java.io.*;
 import java.util.HashMap;

core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java

@@ -1,8 +1,6 @@
 package com.gmail.nossr50.core.data.blockmeta.conversion;
 
 import com.gmail.nossr50.core.config.ChunkConversionOptions;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.scheduler.BukkitScheduler;
 
 import java.io.File;
 

core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java

@@ -1,20 +1,18 @@
 package com.gmail.nossr50.core.data.database;
 
-import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
-import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
-import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
-import com.gmail.nossr50.core.mcmmo.database.UpgradeType;
-import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
-import com.gmail.nossr50.core.mcmmo.player.UniqueDataType;
-import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
-import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.OfflinePlayer;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.datatypes.database.PlayerStat;
+import com.gmail.nossr50.core.datatypes.database.UpgradeType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.UniqueDataType;
+import com.gmail.nossr50.core.runnables.database.UUIDUpdateAsyncTask;
+import com.gmail.nossr50.core.skills.MobHealthbarType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SuperAbilityType;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.StringUtils;
+import sun.security.krb5.Config;
 
 import java.io.*;
 import java.util.*;

core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java

@@ -1,21 +1,19 @@
 package com.gmail.nossr50.core.data.database;
 
-import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
-import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
-import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
-import com.gmail.nossr50.core.mcmmo.database.UpgradeType;
-import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
-import com.gmail.nossr50.core.mcmmo.player.UniqueDataType;
-import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
-import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.datatypes.database.PlayerStat;
+import com.gmail.nossr50.core.datatypes.database.UpgradeType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.UniqueDataType;
+import com.gmail.nossr50.core.runnables.database.UUIDUpdateAsyncTask;
+import com.gmail.nossr50.core.skills.MobHealthbarType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SuperAbilityType;
+import com.gmail.nossr50.core.util.Misc;
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.bukkit.scheduler.BukkitRunnable;
+import sun.security.krb5.Config;
 
 import java.sql.*;
 import java.util.*;

core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.datatypes.chat;
 
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 
 public enum ChatMode {
     ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),

core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.datatypes.experience;
 
-import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.core.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 
 import java.util.concurrent.Delayed;

core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.core.datatypes.json;
 
-import net.md_5.bungee.api.chat.BaseComponent;
 
 public class CustomBaseComponent extends BaseComponent {
     @Override

core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.datatypes.json;
 
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.util.StringUtils;
 
 public enum McMMOWebLinks {
     WEBSITE,

core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.core.datatypes.meta;
 
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.metadata.FixedMetadataValue;
 
 /**
  * This class is for storing mob names since we switch them to heart values

core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.core.datatypes.mods;
 
-import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 public class CustomEntity {
     private double xpMultiplier;

core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.core.datatypes.party;
 
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
+import com.gmail.nossr50.core.util.ItemUtils;
+import com.gmail.nossr50.core.util.StringUtils;
 
 public enum ItemShareType {
     LOOT,

core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java

@@ -1,17 +1,16 @@
 package com.gmail.nossr50.core.datatypes.party;
 
-import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.config.MainConfig;
+import com.gmail.nossr50.core.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.colors.ChatColor;
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.party.PartyManager;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.sounds.SoundManager;
+import com.gmail.nossr50.core.util.sounds.SoundType;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java

@@ -1,11 +1,10 @@
 package com.gmail.nossr50.core.datatypes.party;
 
-import com.gmail.nossr50.commands.party.PartySubcommandType;
 import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.StringUtils;
 
 public enum PartyFeature {
     CHAT,

core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.datatypes.party;
 
 import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.util.Misc;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.util.Misc;
 
 public class PartyTeleportRecord {
     private Player requestor;

core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.core.datatypes.party;
 
-import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 
 public enum ShareMode {
     NONE,

core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java

@@ -1,17 +1,16 @@
 package com.gmail.nossr50.core.datatypes.player;
 
-import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.config.MainConfig;
+import com.gmail.nossr50.core.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.datatypes.experience.SkillXpGain;
+import com.gmail.nossr50.core.runnables.player.PlayerProfileSaveTask;
 import com.gmail.nossr50.core.skills.MobHealthbarType;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
-import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.core.skills.child.FamilyTree;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.HashMap;

core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.core.events.chat;
 
-import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.core.mcmmo.plugin.Plugin;
 
 /**
  * Called when a chat is sent to a party channel

core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java

@@ -2,11 +2,8 @@ package com.gmail.nossr50.core.events.experience;
 
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
 
 /**
  * Generic event for mcMMO experience events.

core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.events.experience;
 
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
 
 /**
  * Called when a user levels change

core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.experience;
 
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
 
 /**
  * Called when a user loses levels in a skill

core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.experience;
 
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
 
 /**
  * Called when a user levels up in a skill

core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.experience;
 
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
 
 /**
  * Called when a player gains XP in a skill

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java

@@ -1,8 +1,6 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockBreakEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * Called when mcMMO breaks a block due to a special ability.

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 /**
  * Called when mcMMO damages a block due to a special ability.

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java

@@ -1,8 +1,5 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.block.Block;
-import org.bukkit.event.inventory.BrewEvent;
-import org.bukkit.inventory.BrewerInventory;
 
 public class FakeBrewEvent extends BrewEvent {
     public FakeBrewEvent(Block brewer, BrewerInventory contents, int fuelLevel) {

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java

@@ -2,11 +2,6 @@ package com.gmail.nossr50.core.events.fake;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-
-import java.util.EnumMap;
-import java.util.Map;
 
 /**
  * Called when mcMMO applies damage from an entity due to special abilities.

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java

@@ -2,11 +2,7 @@ package com.gmail.nossr50.core.events.fake;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.entity.EntityDamageEvent;
 
-import java.util.EnumMap;
-import java.util.Map;
 
 /**
  * Called when mcMMO applies damage due to special abilities.

core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java

@@ -1,8 +1,5 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.entity.EntityTameEvent;
 
 /**
  * Called when mcMMO tames an animal via Call of the Wild

core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerAnimationEvent;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * Called when handling extra drops to avoid issues with NoCheat.

core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.core.events.fake;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.FishHook;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerFishEvent;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 public class FakePlayerFishEvent extends PlayerFishEvent {
     public FakePlayerFishEvent(Player player, Entity entity, FishHook hookEntity, State state) {

core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.hardcore;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 import java.util.HashMap;
 

core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.hardcore;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 public class McMMOPlayerPreDeathPenaltyEvent extends PlayerEvent implements Cancellable {
     /**

core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.core.events.hardcore;
 
-import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 import java.util.HashMap;
 

core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.core.events.hardcore;
 
-import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 import java.util.HashMap;
 

core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java

@@ -1,10 +1,6 @@
 package com.gmail.nossr50.core.events.items;
 
-import org.bukkit.Location;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 /**
  * Called when mcMMO is preparing to drop an item.

core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.party;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 public class McMMOPartyAllianceChangeEvent extends PlayerEvent implements Cancellable {
     /**

core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.party;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * Called when a player attempts to join, leave, or change parties.

core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.party;
 
 import com.gmail.nossr50.core.datatypes.party.Party;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
 
 public class McMMOPartyLevelUpEvent extends Event implements Cancellable {
     /**

core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java

@@ -1,8 +1,6 @@
 package com.gmail.nossr50.core.events.party;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * Called just before a player teleports using the /ptp command.

core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.party;
 
 import com.gmail.nossr50.core.datatypes.party.Party;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
 
 public class McMMOPartyXpGainEvent extends Event implements Cancellable {
     /**

core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.scoreboard;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.scoreboard.Scoreboard;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * The parent class of all mcMMO scoreboard events

core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.core.events.scoreboard;
 
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.Scoreboard;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * This event is called when mcMMO creates its custom boards

core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java

@@ -1,9 +1,6 @@
 package com.gmail.nossr50.core.events.scoreboard;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.scoreboard.Objective;
-import org.bukkit.scoreboard.Scoreboard;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 public class McMMOScoreboardObjectiveEvent extends McMMOScoreboardEvent implements Cancellable {
     protected final ScoreboardObjectiveEventReason objectiveEventReason;

core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.core.events.scoreboard;
 
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.Scoreboard;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 /**
  * This event is called when mcMMO is attempting to change a players targetBoard back to their previous board

core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java

@@ -1,12 +1,9 @@
 package com.gmail.nossr50.core.events.skills;
 
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+
+import java.awt.*;
 
 /**
  * This event is sent for when mcMMO informs a player about various important information

core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java

@@ -1,10 +1,8 @@
 package com.gmail.nossr50.core.events.skills;
 
 import com.gmail.nossr50.core.data.UserManager;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
 
 /**
  * Generic event for mcMMO skill handling.

core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.events.skills.abilities;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class McMMOPlayerAbilityActivateEvent extends McMMOPlayerAbilityEvent implements Cancellable {
     private boolean cancelled;

core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.events.skills.abilities;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import org.bukkit.entity.Player;
 
 public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent {
     public McMMOPlayerAbilityDeactivateEvent(Player player, PrimarySkillType skill) {

core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.core.events.skills.abilities;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
 
 public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent {
     private SuperAbilityType ability;

core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java

@@ -1,12 +1,9 @@
 package com.gmail.nossr50.core.events.skills.alchemy;
 
+import com.gmail.nossr50.core.mcmmo.block.BlockState;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.BrewingStand;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class McMMOPlayerBrewEvent extends McMMOPlayerSkillEvent implements Cancellable {
     private BlockState brewingStand;

core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.skills.alchemy;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class McMMOPlayerCatalysisEvent extends McMMOPlayerSkillEvent implements Cancellable {
     private double speed;

core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.skills.fishing;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class McMMOPlayerFishingEvent extends McMMOPlayerSkillEvent implements Cancellable {
     private boolean cancelled;

core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.events.skills.fishing;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 public class McMMOPlayerFishingTreasureEvent extends McMMOPlayerFishingEvent {
     private ItemStack treasure;

core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java

@@ -1,10 +1,8 @@
 package com.gmail.nossr50.core.events.skills.fishing;
 
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
-import java.util.Map;
 
 public class McMMOPlayerMagicHunterEvent extends McMMOPlayerFishingTreasureEvent {
     private Map<Enchantment, Integer> enchants;

core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java

@@ -1,7 +1,8 @@
 package com.gmail.nossr50.core.events.skills.fishing;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 
 public class McMMOPlayerShakeEvent extends McMMOPlayerFishingEvent {
     private ItemStack drop;

core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java

@@ -1,10 +1,9 @@
 package com.gmail.nossr50.core.events.skills.repair;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.inventory.ItemStack;
 
 /**
  * Called just before a player repairs an object with mcMMO.

core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java

@@ -1,10 +1,9 @@
 package com.gmail.nossr50.core.events.skills.salvage;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.inventory.ItemStack;
 
 /**
  * Called just before a player salvages an item with mcMMO.

core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java

@@ -1,11 +1,10 @@
 package com.gmail.nossr50.core.events.skills.secondaryabilities;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable {
     private SubSkillType subSkillType;

core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.events.skills.secondaryabilities;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
-import org.bukkit.entity.Player;
 
 public class SubSkillRandomCheckEvent extends SubSkillEvent {
     private double chance;

core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java

@@ -1,9 +1,8 @@
 package com.gmail.nossr50.core.events.skills.unarmed;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 
 public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable {
     private boolean cancelled;

core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.locale;
 
 import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.ChatColor;
+import com.gmail.nossr50.core.mcmmo.colors.ChatColor;
 
 import java.text.MessageFormat;
 import java.util.Locale;

core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java

@@ -11,18 +11,15 @@ import com.gmail.nossr50.core.datatypes.party.PartyLeader;
 import com.gmail.nossr50.core.datatypes.party.ShareMode;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.events.party.McMMOPartyAllianceChangeEvent;
+import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.util.Misc;
 import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.core.util.player.NotificationManager;
 import com.gmail.nossr50.core.util.sounds.SoundManager;
 import com.gmail.nossr50.core.util.sounds.SoundType;
-import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.util.ArrayList;

core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.party;
 
-import com.gmail.nossr50.config.party.ItemWeightConfig;
 import com.gmail.nossr50.core.config.MainConfig;
+import com.gmail.nossr50.core.config.party.ItemWeightConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
@@ -9,11 +9,10 @@ import com.gmail.nossr50.core.datatypes.party.ItemShareType;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.ShareMode;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.util.Misc;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 

core/src/main/java/com/gmail/nossr50/core/runnables/CheckDateTask.java

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.core.runnables;
 
 import com.gmail.nossr50.core.runnables.skills.AprilTask;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.Misc;
 
 public class CheckDateTask extends BukkitRunnable {
 

core/src/main/java/com/gmail/nossr50/core/runnables/MobHealthDisplayUpdaterTask.java

@@ -1,8 +1,5 @@
 package com.gmail.nossr50.core.runnables;
 
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class MobHealthDisplayUpdaterTask extends BukkitRunnable {
     private LivingEntity target;

core/src/main/java/com/gmail/nossr50/core/runnables/PistonTrackerTask.java

@@ -1,12 +1,6 @@
 package com.gmail.nossr50.core.runnables;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.BlockUtils;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.List;
+import com.gmail.nossr50.core.util.BlockUtils;
 
 public class PistonTrackerTask extends BukkitRunnable {
     private List<Block> blocks;

core/src/main/java/com/gmail/nossr50/core/runnables/SaveTimerTask.java

@@ -2,10 +2,8 @@ package com.gmail.nossr50.core.runnables;
 
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.party.PartyManager;
 import com.gmail.nossr50.core.runnables.player.PlayerProfileSaveTask;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class SaveTimerTask extends BukkitRunnable {
     @Override

core/src/main/java/com/gmail/nossr50/core/runnables/StickyPistonTrackerTask.java

@@ -1,10 +1,6 @@
 package com.gmail.nossr50.core.runnables;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.BlockUtils;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.BlockUtils;
 
 public class StickyPistonTrackerTask extends BukkitRunnable {
     private BlockFace direction;

core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java

@@ -1,8 +1,6 @@
 package com.gmail.nossr50.core.runnables.backups;
 
 import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
 import java.text.ParseException;

core/src/main/java/com/gmail/nossr50/core/runnables/commands/McScoreboardKeepTask.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.runnables.commands;
 
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 
 public class McScoreboardKeepTask extends BukkitRunnable {
     private Player player;

core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandAsyncTask.java

@@ -1,11 +1,8 @@
 package com.gmail.nossr50.core.runnables.commands;
 
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import org.apache.commons.lang.Validate;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.Map;
 

core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java

@@ -2,12 +2,10 @@ package com.gmail.nossr50.core.runnables.commands;
 
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 
 import java.util.Map;
 

core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandAsyncTask.java

@@ -1,12 +1,9 @@
 package com.gmail.nossr50.core.runnables.commands;
 
 import com.gmail.nossr50.core.datatypes.database.PlayerStat;
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import org.apache.commons.lang.Validate;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.List;
 

core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java

@@ -3,13 +3,11 @@ package com.gmail.nossr50.core.runnables.commands;
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.database.PlayerStat;
 import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.colors.ChatColor;
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 
 import java.util.List;
 

core/src/main/java/com/gmail/nossr50/core/runnables/database/DatabaseConversionTask.java

@@ -2,9 +2,7 @@ package com.gmail.nossr50.core.runnables.database;
 
 import com.gmail.nossr50.core.data.database.DatabaseManager;
 import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.commands.CommandSender;
 
 public class DatabaseConversionTask extends BukkitRunnable {
     private final DatabaseManager sourceDatabase;

core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java

@@ -3,14 +3,13 @@ package com.gmail.nossr50.core.runnables.items;
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.ChimaeraWing;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
+import com.gmail.nossr50.core.mcmmo.world.Location;
+import com.gmail.nossr50.core.util.ChimaeraWing;
+import com.gmail.nossr50.core.util.ItemUtils;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 
 public class ChimaeraWingWarmup extends BukkitRunnable {
     private McMMOPlayer mcMMOPlayer;

core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java

@@ -3,13 +3,12 @@ package com.gmail.nossr50.core.runnables.items;
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.world.Location;
+import com.gmail.nossr50.core.party.PartyManager;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 
 public class TeleportationWarmup extends BukkitRunnable {
     private McMMOPlayer mcMMOPlayer;

core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java

@@ -2,15 +2,10 @@ package com.gmail.nossr50.core.runnables.party;
 
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.party.PartyManager;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.UUID;
 
 public class PartyAutoKickTask extends BukkitRunnable {

core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java

@@ -3,10 +3,8 @@ package com.gmail.nossr50.core.runnables.party;
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.locale.LocaleLoader;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.colors.ChatColor;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

core/src/main/java/com/gmail/nossr50/core/runnables/player/ClearRegisteredXPGainTask.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.core.runnables.player;
 
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class ClearRegisteredXPGainTask extends BukkitRunnable {
     @Override

core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java

@@ -5,13 +5,10 @@ import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.runnables.commands.McScoreboardKeepTask;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 
 public class PlayerProfileLoadingTask extends BukkitRunnable {
     private static final int MAX_TRIES = 5;

core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileSaveTask.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.core.runnables.player;
 
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class PlayerProfileSaveTask extends BukkitRunnable {
     private PlayerProfile playerProfile;

core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerUpdateInventoryTask.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.runnables.player;
 
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 @SuppressWarnings("deprecation")
 public class PlayerUpdateInventoryTask extends BukkitRunnable {

core/src/main/java/com/gmail/nossr50/core/runnables/player/PowerLevelUpdatingTask.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.runnables.player;
 
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import org.bukkit.scheduler.BukkitRunnable;
+
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 
 public class PowerLevelUpdatingTask extends BukkitRunnable {
     @Override

core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityCooldownTask.java

@@ -3,8 +3,7 @@ package com.gmail.nossr50.core.runnables.skills;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
-import com.gmail.nossr50.util.player.NotificationManager;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.player.NotificationManager;
 
 public class AbilityCooldownTask extends BukkitRunnable {
     private McMMOPlayer mcMMOPlayer;

core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java

@@ -3,18 +3,15 @@ package com.gmail.nossr50.core.runnables.skills;
 import com.gmail.nossr50.core.config.MainConfig;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.world.World;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.player.NotificationManager;
-import com.gmail.nossr50.util.skills.ParticleEffectUtils;
-import com.gmail.nossr50.util.skills.PerksUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.player.NotificationManager;
+import com.gmail.nossr50.core.util.skills.ParticleEffectUtils;
+import com.gmail.nossr50.core.util.skills.PerksUtils;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 
 public class AbilityDisableTask extends BukkitRunnable {
     private McMMOPlayer mcMMOPlayer;

core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewCheckTask.java

@@ -1,12 +1,9 @@
 package com.gmail.nossr50.core.runnables.skills;
 
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.mcmmo.item.ItemStack;
 import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
 import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotionBrewer;
-import org.bukkit.Location;
-import org.bukkit.block.BrewingStand;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.Arrays;