Moving stuff around, what a mess this is going to be.

core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.config.experience;
 
 import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
-import com.gmail.nossr50.core.datatypes.experience.FormulaType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.alchemy.PotionStage;
+import com.gmail.nossr50.core.mcmmo.experience.FormulaType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.alchemy.PotionStage;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

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

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+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;

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

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.core.mcmmo.mods.CustomBlock;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 

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

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomEntity;
+import com.gmail.nossr50.core.mcmmo.mods.CustomEntity;
 import org.apache.commons.lang.ClassUtils;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

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

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomTool;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+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;

core/src/main/java/com/gmail/nossr50/core/config/skills/AdvancedConfig.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.interactions.NotificationType;
+import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.mcMMO;
 import net.md_5.bungee.api.ChatColor;
 

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

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.config.skills;
 
 import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
+import com.gmail.nossr50.core.mcmmo.party.PartyFeature;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

core/src/main/java/com/gmail/nossr50/core/config/skills/CoreSkillsConfig.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.util.StringUtils;
 
 public class CoreSkillsConfig extends AutoUpdateConfigLoader {

core/src/main/java/com/gmail/nossr50/core/config/skills/RankConfig.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.config.skills.alchemy;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.alchemy.AlchemyPotion;
+import com.gmail.nossr50.core.mcmmo.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;

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

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.config.skills.repair;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+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.ItemUtils;

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

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.config.skills.salvage;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+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;

core/src/main/java/com/gmail/nossr50/core/data/UserManager.java

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data;
 
-import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.OfflinePlayer;

core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/PrimitiveChunkStore.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.data.blockmeta.chunkmeta;
 
 import com.gmail.nossr50.core.data.blockmeta.ChunkletStore;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
+import com.gmail.nossr50.core.mcmmo.World;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

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

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.core.datatypes.database.PlayerStat;
-import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
+import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
 import com.gmail.nossr50.mcMMO;
 
 public class DatabaseManagerFactory {

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

@@ -2,14 +2,14 @@ package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-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.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+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;

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

@@ -2,14 +2,14 @@ package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-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.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+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;

core/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.core.datatypes;
 
-
-import org.bukkit.Location;
+import com.gmail.nossr50.core.mcmmo.Location;
 
 public class LimitedSizeList {
     public Location[] limitedSizeOrderedList;

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

@@ -4,15 +4,15 @@ import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.core.config.skills.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.core.datatypes.mods.CustomTool;
-import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.datatypes.mods.CustomTool;
+import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.skills.ToolType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;

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

@@ -3,11 +3,11 @@ package com.gmail.nossr50.core.datatypes.player;
 import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.datatypes.experience.SkillXpGain;
 import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.datatypes.MobHealthbarType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
 import com.gmail.nossr50.skills.child.FamilyTree;

core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.core.datatypes.skills.subskills;
 
 import com.gmail.nossr50.core.config.skills.CoreSkillsConfig;
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.Interaction;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.Rank;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.SubSkill;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.SubSkillProperties;
+import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import org.bukkit.entity.Player;
 

core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java

@@ -3,9 +3,9 @@ package com.gmail.nossr50.core.datatypes.skills.subskills.acrobatics;
 import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.LimitedSizeList;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
+import com.gmail.nossr50.core.datatypes.LimitedSizeList;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.core.datatypes.skills.SubSkillType;

core/src/main/java/com/gmail/nossr50/core/mcmmo/AbstractWorld.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 import java.util.Objects;
 

core/src/main/java/com/gmail/nossr50/core/mcmmo/Location.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 /**
  * This class represents a Location in MC

core/src/main/java/com/gmail/nossr50/core/mcmmo/Nameable.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 public interface Nameable extends Named {
     /**

core/src/main/java/com/gmail/nossr50/core/mcmmo/Named.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 /**
  * A lot of Objects in MC have names

core/src/main/java/com/gmail/nossr50/core/mcmmo/Property.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 import java.util.Collection;
 

core/src/main/java/com/gmail/nossr50/core/mcmmo/World.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 public interface World {
     /**

core/src/main/java/com/gmail/nossr50/core/mcmmo/block/Block.java

@@ -1,6 +1,6 @@
-package com.gmail.nossr50.core.datatypes.block;
+package com.gmail.nossr50.core.mcmmo.block;
 
-import com.gmail.nossr50.core.datatypes.Property;
+import com.gmail.nossr50.core.mcmmo.Property;
 
 /**
  * Represents a container of properties and values for a Block

core/src/main/java/com/gmail/nossr50/core/mcmmo/block/BlockState.java

@@ -1,6 +1,6 @@
-package com.gmail.nossr50.core.datatypes.block;
+package com.gmail.nossr50.core.mcmmo.block;
 
-import com.gmail.nossr50.core.datatypes.Property;
+import com.gmail.nossr50.core.mcmmo.Property;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Collection;

core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Entity.java

@@ -1,7 +1,7 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
-import com.gmail.nossr50.core.datatypes.Location;
-import com.gmail.nossr50.core.datatypes.Named;
+import com.gmail.nossr50.core.mcmmo.Location;
+import com.gmail.nossr50.core.mcmmo.Named;
 
 import java.util.UUID;
 

core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
 /**
  * Living means you can die, you have health, and you can be damaged

core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java

@@ -1,6 +1,7 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
-import com.gmail.nossr50.core.datatypes.Nameable;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.Nameable;
 
 /**
  * Players

core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Cancellable.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * This class handles cancellations for an event

core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Event.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * Represents an event for a given API

core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventType.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * Different platforms have different event systems