Refactor

2019-02-17 15:09:43 +01:00 · 2019-02-17 15:09:43 +01:00 · 3575de589b
commit 3575de589b
parent 0376a2cea7
48 changed files with 639 additions and 627 deletions
--- a/src/com/massivecraft/massivecore/MassiveCore.java
+++ b/src/com/massivecraft/massivecore/MassiveCore.java
@ -55,6 +55,10 @@ import com.massivecraft.massivecore.engine.EngineMassiveCoreScheduledTeleport;
 import com.massivecraft.massivecore.engine.EngineMassiveCoreTeleportMixinCause;
 import com.massivecraft.massivecore.engine.EngineMassiveCoreVariable;
 import com.massivecraft.massivecore.engine.EngineMassiveCoreWorldNameSet;
+import com.massivecraft.massivecore.entity.AspectColl;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConfColl;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import com.massivecraft.massivecore.entity.migrator.MigratorMassiveCoreMConf001CleanInactivity;
 import com.massivecraft.massivecore.integration.vault.IntegrationVault;
 import com.massivecraft.massivecore.mixin.MixinActionbar;
--- a/src/com/massivecraft/massivecore/MassiveCoreTaskDeleteFiles.java
+++ b/src/com/massivecraft/massivecore/MassiveCoreTaskDeleteFiles.java
@ -1,5 +1,7 @@
 package com.massivecraft.massivecore;

+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
+
 import java.io.File;

 public class MassiveCoreTaskDeleteFiles implements Runnable
--- a/src/com/massivecraft/massivecore/MassivePlugin.java
+++ b/src/com/massivecraft/massivecore/MassivePlugin.java
@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.engine.EngineMassiveCoreCommandRegistration;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.mixin.Mixin;
 import com.massivecraft.massivecore.mixin.MixinMessage;
 import com.massivecraft.massivecore.predicate.Predicate;
--- a/src/com/massivecraft/massivecore/chestgui/ChestGui.java
+++ b/src/com/massivecraft/massivecore/chestgui/ChestGui.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.chestgui;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.SoundEffect;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.collections.MassiveMap;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCore.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCore.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.command.MassiveCommandVersion;
 import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreBuffer.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreBuffer.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 import java.util.List;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreClick.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreClick.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.TypeStringCommand;
 import com.massivecraft.massivecore.mixin.MixinCommand;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreCmdurl.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreCmdurl.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStore.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreStore.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 import java.util.List;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 import java.util.List;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectList.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectList.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.Aspect;
-import com.massivecraft.massivecore.AspectColl;
+import com.massivecraft.massivecore.entity.Aspect;
+import com.massivecraft.massivecore.entity.AspectColl;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.Parameter;
 import com.massivecraft.massivecore.pager.Pager;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectShow.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectShow.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.Aspect;
+import com.massivecraft.massivecore.entity.Aspect;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.store.TypeAspect;
 import com.massivecraft.massivecore.util.Txt;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectUse.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectUse.java
@ -1,8 +1,8 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.Aspect;
+import com.massivecraft.massivecore.entity.Aspect;
 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.store.TypeAspect;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseDel.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseDel.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

 public class CmdMassiveCoreUsysMultiverseDel extends MassiveCoreCommand
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseList.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseList.java
@ -1,8 +1,8 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
-import com.massivecraft.massivecore.MultiverseColl;
+import com.massivecraft.massivecore.entity.Multiverse;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import com.massivecraft.massivecore.command.Parameter;
 import com.massivecraft.massivecore.pager.Pager;
 import com.massivecraft.massivecore.pager.Stringifier;
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseNew.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseNew.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.MultiverseColl;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;

 public class CmdMassiveCoreUsysMultiverseNew extends MassiveCoreCommand
--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java
@ -1,9 +1,9 @@
 package com.massivecraft.massivecore.cmd;

-import com.massivecraft.massivecore.Aspect;
+import com.massivecraft.massivecore.entity.Aspect;
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;
 import com.massivecraft.massivecore.util.Txt;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseClear.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseClear.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseDel.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseDel.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseNew.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysUniverseNew.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

--- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysWorld.java
+++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysWorld.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.cmd;

 import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;

--- a/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java
+++ b/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.command;

 import com.massivecraft.massivecore.Lang;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.mixin.MixinMessage;
 import com.massivecraft.massivecore.util.MUtil;
--- a/src/com/massivecraft/massivecore/command/type/TypeUniverse.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeUniverse.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.command.type;

-import com.massivecraft.massivecore.Aspect;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Aspect;
+import com.massivecraft.massivecore.entity.Multiverse;

 import java.util.Collection;

--- a/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java
+++ b/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.command.type.store;

-import com.massivecraft.massivecore.Aspect;
-import com.massivecraft.massivecore.AspectColl;
+import com.massivecraft.massivecore.entity.Aspect;
+import com.massivecraft.massivecore.entity.AspectColl;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import org.bukkit.command.CommandSender;

--- a/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java
+++ b/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java
@ -1,8 +1,8 @@
 package com.massivecraft.massivecore.command.type.store;

 import com.massivecraft.massivecore.MassiveCorePerm;
-import com.massivecraft.massivecore.Multiverse;
-import com.massivecraft.massivecore.MultiverseColl;
+import com.massivecraft.massivecore.entity.Multiverse;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import org.bukkit.command.CommandSender;

 public class TypeMultiverse extends TypeEntity<Multiverse>
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreClean.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreClean.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.engine;

 import com.massivecraft.massivecore.Engine;
 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.event.EventMassiveCorePlayerCleanInactivityToleranceMillis;
 import com.massivecraft.massivecore.store.Coll;
 import com.massivecraft.massivecore.store.cleanable.CleaningUtil;
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.engine;

 import com.massivecraft.massivecore.Engine;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.event.EventMassiveCoreLorePriority;
 import com.massivecraft.massivecore.util.InventoryUtil;
 import com.massivecraft.massivecore.util.MUtil;
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.engine;

 import com.massivecraft.massivecore.Engine;
 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.SenderPresence;
 import com.massivecraft.massivecore.SenderType;
 import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn;
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.engine;

 import com.massivecraft.massivecore.Engine;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.InventoryUtil;
--- a/src/com/massivecraft/massivecore/entity/Aspect.java
+++ b/src/com/massivecraft/massivecore/entity/Aspect.java
@ -1,6 +1,7 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

 import com.google.gson.annotations.SerializedName;
+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.store.Entity;

 import java.util.ArrayList;
--- a/src/com/massivecraft/massivecore/entity/AspectColl.java
+++ b/src/com/massivecraft/massivecore/entity/AspectColl.java
@ -1,4 +1,4 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

 import com.massivecraft.massivecore.store.Coll;

--- a/src/com/massivecraft/massivecore/entity/MassiveCoreMConf.java
+++ b/src/com/massivecraft/massivecore/entity/MassiveCoreMConf.java
@ -1,5 +1,6 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

+import com.massivecraft.massivecore.SoundEffect;
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.massivecraft.massivecore.command.editor.annotation.EditorName;
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
--- a/src/com/massivecraft/massivecore/entity/MassiveCoreMConfColl.java
+++ b/src/com/massivecraft/massivecore/entity/MassiveCoreMConfColl.java
@ -1,5 +1,6 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.store.Coll;

 public class MassiveCoreMConfColl extends Coll<MassiveCoreMConf>
--- a/src/com/massivecraft/massivecore/entity/Multiverse.java
+++ b/src/com/massivecraft/massivecore/entity/Multiverse.java
@ -1,5 +1,6 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.command.type.TypeUniverse;
 import com.massivecraft.massivecore.store.Entity;
 import com.massivecraft.massivecore.util.MUtil;
--- a/src/com/massivecraft/massivecore/entity/MultiverseColl.java
+++ b/src/com/massivecraft/massivecore/entity/MultiverseColl.java
@ -1,5 +1,6 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;

+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.store.Coll;

 public class MultiverseColl extends Coll<Multiverse>
--- a/src/com/massivecraft/massivecore/entity/migrator/MigratorMassiveCoreMConf001CleanInactivity.java
+++ b/src/com/massivecraft/massivecore/entity/migrator/MigratorMassiveCoreMConf001CleanInactivity.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.entity.migrator;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.store.migrator.MigratorFieldRename;
 import com.massivecraft.massivecore.store.migrator.MigratorRoot;

--- a/src/com/massivecraft/massivecore/mixin/Mixin.java
+++ b/src/com/massivecraft/massivecore/mixin/Mixin.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.mixin;

 import com.massivecraft.massivecore.Engine;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.massivecraft.massivecore.util.ReflectionUtil;
--- a/src/com/massivecraft/massivecore/mixin/MixinTeleport.java
+++ b/src/com/massivecraft/massivecore/mixin/MixinTeleport.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.mixin;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.engine.EngineMassiveCoreTeleportMixinCause;
 import com.massivecraft.massivecore.event.EventMassiveCorePlayerPSTeleport;
 import com.massivecraft.massivecore.ps.PS;
--- a/src/com/massivecraft/massivecore/nms/NmsChat.java
+++ b/src/com/massivecraft/massivecore/nms/NmsChat.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.nms;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.mixin.Mixin;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.IdUtil;
--- a/src/com/massivecraft/massivecore/ps/PS.java
+++ b/src/com/massivecraft/massivecore/ps/PS.java
@ -3,9 +3,9 @@ package com.massivecraft.massivecore.ps;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
-import com.massivecraft.massivecore.Aspect;
+import com.massivecraft.massivecore.entity.Aspect;
 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.collections.MassiveSet;
 import com.massivecraft.massivecore.comparator.ComparatorSmart;
 import com.massivecraft.massivecore.util.MUtil;
--- a/src/com/massivecraft/massivecore/store/Coll.java
+++ b/src/com/massivecraft/massivecore/store/Coll.java
@ -6,7 +6,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.massivecraft.massivecore.ConfServer;
 import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassivePlugin;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.comparator.ComparatorNaturalOrder;
--- a/src/com/massivecraft/massivecore/store/Colls.java
+++ b/src/com/massivecraft/massivecore/store/Colls.java
@ -1,9 +1,9 @@
 package com.massivecraft.massivecore.store;

 import com.massivecraft.massivecore.Active;
-import com.massivecraft.massivecore.Aspect;
+import com.massivecraft.massivecore.entity.Aspect;
 import com.massivecraft.massivecore.MassivePlugin;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 import com.massivecraft.massivecore.util.MUtil;

 import java.util.ArrayList;
--- a/src/com/massivecraft/massivecore/store/DriverMongo.java
+++ b/src/com/massivecraft/massivecore/store/DriverMongo.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.store;


 import com.google.gson.JsonObject;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
--- a/src/com/massivecraft/massivecore/store/Entity.java
+++ b/src/com/massivecraft/massivecore/store/Entity.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.store;

 import com.google.gson.JsonObject;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.util.MUtil;

 import java.util.List;
--- a/src/com/massivecraft/massivecore/store/MStore.java
+++ b/src/com/massivecraft/massivecore/store/MStore.java
@ -2,7 +2,7 @@ package com.massivecraft.massivecore.store;

 import com.google.gson.JsonElement;
 import com.massivecraft.massivecore.ConfServer;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 import java.net.URI;
 import java.net.URISyntaxException;
--- a/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java
+++ b/src/com/massivecraft/massivecore/store/ModificationPollerLocal.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.store;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 /*
 * This class polls for local changes in all colls.
--- a/src/com/massivecraft/massivecore/store/ModificationPollerRemote.java
+++ b/src/com/massivecraft/massivecore/store/ModificationPollerRemote.java
@ -1,6 +1,6 @@
 package com.massivecraft.massivecore.store;

-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;

 /*
 * This class polls for remote changes in colls.
--- a/src/com/massivecraft/massivecore/test/Test.java
+++ b/src/com/massivecraft/massivecore/test/Test.java
@ -1,7 +1,7 @@
 package com.massivecraft.massivecore.test;

 import com.massivecraft.massivecore.Engine;
-import com.massivecraft.massivecore.MassiveCoreMConf;
+import com.massivecraft.massivecore.entity.MassiveCoreMConf;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.mixin.MixinMessage;
 import com.massivecraft.massivecore.util.IdUtil;