Refactor

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;

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

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;

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;

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;

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;
 

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;

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;

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;
 

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;
 

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.entity.Aspect;
-import com.massivecraft.massivecore.AspectColl;
+import com.massivecraft.massivecore.entity.AspectColl;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.Parameter;
 import com.massivecraft.massivecore.pager.Pager;

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;

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;
 

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

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.entity.Multiverse;
-import com.massivecraft.massivecore.MultiverseColl;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import com.massivecraft.massivecore.command.Parameter;
 import com.massivecraft.massivecore.pager.Pager;
 import com.massivecraft.massivecore.pager.Stringifier;

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

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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.entity.Aspect;
-import com.massivecraft.massivecore.Multiverse;
+import com.massivecraft.massivecore.entity.Multiverse;
 
 import java.util.Collection;
 

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.entity.Aspect;
-import com.massivecraft.massivecore.AspectColl;
+import com.massivecraft.massivecore.entity.AspectColl;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import org.bukkit.command.CommandSender;
 

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.entity.Multiverse;
-import com.massivecraft.massivecore.MultiverseColl;
+import com.massivecraft.massivecore.entity.MultiverseColl;
 import org.bukkit.command.CommandSender;
 
 public class TypeMultiverse extends TypeEntity<Multiverse>

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;

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;

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;

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;

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;

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;
 

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;

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>

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;

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>

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.

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.

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;