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,59 +1,60 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.SerializedName;
-import com.massivecraft.massivecore.store.Entity;
+import com.massivecraft.massivecore.MassiveCore;
-
+import com.massivecraft.massivecore.store.Entity;
-import java.util.ArrayList;
+
-import java.util.Arrays;
+import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Arrays;
-
+import java.util.Collection;
-public class Aspect extends Entity<Aspect>
+
-{	
+public class Aspect extends Entity<Aspect>
-	// -------------------------------------------- //
+{	
-	// META
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// META
-	
+	// -------------------------------------------- //
-	public static Aspect get(Object oid)
+	
-	{
+	public static Aspect get(Object oid)
-		return AspectColl.get().get(oid);
+	{
-	}
+		return AspectColl.get().get(oid);
-	
+	}
-	// -------------------------------------------- //
+	
-	// TRANSIENT FIELDS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// TRANSIENT FIELDS
-	
+	// -------------------------------------------- //
-	private transient boolean registered = false;
+	
-	public boolean isRegistered() { return this.registered; }
+	private transient boolean registered = false;
-	public void register() { this.registered = true; }
+	public boolean isRegistered() { return this.registered; }
-	
+	public void register() { this.registered = true; }
-	private transient Collection<String> desc = new ArrayList<>();
+	
-	public Collection<String> getDesc() { return this.desc; }
+	private transient Collection<String> desc = new ArrayList<>();
-	public void setDesc(Collection<String> val) { this.desc = val; }
+	public Collection<String> getDesc() { return this.desc; }
-	public void setDesc(String... val) { this.desc = Arrays.asList(val); }
+	public void setDesc(Collection<String> val) { this.desc = val; }
-	
+	public void setDesc(String... val) { this.desc = Arrays.asList(val); }
-	// -------------------------------------------- //
+	
-	// STORED FIELDS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// STORED FIELDS
-	
+	// -------------------------------------------- //
-	@SerializedName("mid")
+	
-	private String multiverseId;
+	@SerializedName("mid")
-	public String getMultiverseId() { return this.multiverseId; }
+	private String multiverseId;
-	public void setMultiverseId(String multiverseId) { this.multiverseId = multiverseId; }
+	public String getMultiverseId() { return this.multiverseId; }
-	public Multiverse getMultiverse()
+	public void setMultiverseId(String multiverseId) { this.multiverseId = multiverseId; }
-	{
+	public Multiverse getMultiverse()
-		Multiverse ret = MultiverseColl.get().get(this.multiverseId);
+	{
-		if (ret == null) ret = MultiverseColl.get().get(MassiveCore.DEFAULT);
+		Multiverse ret = MultiverseColl.get().get(this.multiverseId);
-		return ret;
+		if (ret == null) ret = MultiverseColl.get().get(MassiveCore.DEFAULT);
-	}
+		return ret;
-	public void setMultiverse(Multiverse val) { this.multiverseId = val.getId(); }
+	}
-	
+	public void setMultiverse(Multiverse val) { this.multiverseId = val.getId(); }
-	// -------------------------------------------- //
+	
-	// CONSTRUCT
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// CONSTRUCT
-	
+	// -------------------------------------------- //
-	public Aspect()
+	
-	{
+	public Aspect()
-		
+	{
-	}
+		
-	
+	}
-}
+	
+}

src/com/massivecraft/massivecore/entity/AspectColl.java

@@ -1,54 +1,54 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.massivecraft.massivecore.store.Coll;
+import com.massivecraft.massivecore.store.Coll;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.List;
+import java.util.List;
-
+
-public class AspectColl extends Coll<Aspect>
+public class AspectColl extends Coll<Aspect>
-{
+{
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	// INSTANCE & CONSTRUCT
+	// INSTANCE & CONSTRUCT
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	
+	
-	private static AspectColl i = new AspectColl();
+	private static AspectColl i = new AspectColl();
-	public static AspectColl get() { return i; }
+	public static AspectColl get() { return i; }
-
+
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	// STACK TRACEABILITY
+	// STACK TRACEABILITY
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	
+	
-	@Override
+	@Override
-	public void onTick()
+	public void onTick()
-	{
+	{
-		super.onTick();
+		super.onTick();
-	}
+	}
-	
+	
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	// EXTRAS
+	// EXTRAS
-	// -------------------------------------------- //
+	// -------------------------------------------- //
-	
+	
-	public List<Aspect> getAllRegistered()
+	public List<Aspect> getAllRegistered()
-	{
+	{
-		List<Aspect> ret = new ArrayList<>();
+		List<Aspect> ret = new ArrayList<>();
-		for (Aspect aspect : this.getAll())
+		for (Aspect aspect : this.getAll())
-		{
+		{
-			if (aspect.isRegistered() == false) continue;
+			if (aspect.isRegistered() == false) continue;
-			ret.add(aspect);
+			ret.add(aspect);
-		}
+		}
-		return ret;
+		return ret;
-	}
+	}
-	
+	
-	public List<Aspect> getAllRegisteredForMultiverse(Multiverse multiverse, boolean normal)
+	public List<Aspect> getAllRegisteredForMultiverse(Multiverse multiverse, boolean normal)
-	{
+	{
-		List<Aspect> ret = new ArrayList<>();
+		List<Aspect> ret = new ArrayList<>();
-		for (Aspect aspect : this.getAll())
+		for (Aspect aspect : this.getAll())
-		{
+		{
-			if (aspect.isRegistered() == false) continue;
+			if (aspect.isRegistered() == false) continue;
-			if ((aspect.getMultiverse() != multiverse) == normal) continue;
+			if ((aspect.getMultiverse() != multiverse) == normal) continue;
-			ret.add(aspect);
+			ret.add(aspect);
-		}
+		}
-		return ret;
+		return ret;
-	}
+	}
-	
+	
-}
+}

src/com/massivecraft/massivecore/entity/MassiveCoreMConf.java

@@ -1,195 +1,196 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.massivecraft.massivecore.collections.MassiveMap;
+import com.massivecraft.massivecore.SoundEffect;
-import com.massivecraft.massivecore.command.editor.annotation.EditorName;
+import com.massivecraft.massivecore.collections.MassiveMap;
-import com.massivecraft.massivecore.command.editor.annotation.EditorType;
+import com.massivecraft.massivecore.command.editor.annotation.EditorName;
-import com.massivecraft.massivecore.command.type.TypeMillisDiff;
+import com.massivecraft.massivecore.command.editor.annotation.EditorType;
-import com.massivecraft.massivecore.command.type.primitive.TypeBooleanOn;
+import com.massivecraft.massivecore.command.type.TypeMillisDiff;
-import com.massivecraft.massivecore.store.Entity;
+import com.massivecraft.massivecore.command.type.primitive.TypeBooleanOn;
-import com.massivecraft.massivecore.util.MUtil;
+import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.massivecore.util.PermissionUtil;
+import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.massivecore.util.TimeUnit;
+import com.massivecraft.massivecore.util.PermissionUtil;
-import com.mongodb.WriteConcern;
+import com.massivecraft.massivecore.util.TimeUnit;
-import org.bukkit.permissions.Permissible;
+import com.mongodb.WriteConcern;
-
+import org.bukkit.permissions.Permissible;
-import java.util.ArrayList;
+
-import java.util.List;
+import java.util.ArrayList;
-import java.util.Map;
+import java.util.List;
-
+import java.util.Map;
-@EditorName("config")
+
-public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
+@EditorName("config")
-{
+public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
-	// -------------------------------------------- //
+{
-	// META
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// META
-	
+	// -------------------------------------------- //
-	protected static transient MassiveCoreMConf i;
+	
-	public static MassiveCoreMConf get() { return i; }
+	protected static transient MassiveCoreMConf i;
-	
+	public static MassiveCoreMConf get() { return i; }
-	// -------------------------------------------- //
+	
-	// VERSION
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// VERSION
-	
+	// -------------------------------------------- //
-	public int version = 1;
+	
-	
+	public int version = 1;
-	// -------------------------------------------- //
+	
-	// ALIASES
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// ALIASES
-	// Base command aliases.
+	// -------------------------------------------- //
-	
+	// Base command aliases.
-	public List<String> aliasesMcore = MUtil.list("massivecore", "mcore");
+	
-	public List<String> aliasesUsys = MUtil.list("usys");
+	public List<String> aliasesMcore = MUtil.list("massivecore", "mcore");
-	public List<String> aliasesMstore = MUtil.list("massivestore", "mstore");
+	public List<String> aliasesUsys = MUtil.list("usys");
-	public List<String> aliasesBuffer = MUtil.list("buffer");
+	public List<String> aliasesMstore = MUtil.list("massivestore", "mstore");
-	public List<String> aliasesCmdurl = MUtil.list("cmdurl");
+	public List<String> aliasesBuffer = MUtil.list("buffer");
-	
+	public List<String> aliasesCmdurl = MUtil.list("cmdurl");
-	// -------------------------------------------- //
+	
-	// GENERAL
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// GENERAL
-	// General configuration options.
+	// -------------------------------------------- //
-	
+	// General configuration options.
-	public String taskServerId = null;
+	
-	public boolean versionSynchronizationEnabled = true;
+	public String taskServerId = null;
-	public int tabCompletionLimit = 100;
+	public boolean versionSynchronizationEnabled = true;
-	public boolean recipientChatEventEnabled = true;
+	public int tabCompletionLimit = 100;
-	public boolean consoleColorsEnabled = true;
+	public boolean recipientChatEventEnabled = true;
-	
+	public boolean consoleColorsEnabled = true;
-	// -------------------------------------------- //
+	
-	// PERMISSIONS FORMATS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// PERMISSIONS FORMATS
-	// Permission denied formatting.
+	// -------------------------------------------- //
-	
+	// Permission denied formatting.
-	public Map<String, String> permissionDeniedFormats = MUtil.map(
+	
-		"some.awesome.permission.node", "<b>You must be awesome to %s<b>.",
+	public Map<String, String> permissionDeniedFormats = MUtil.map(
-		"some.derp.permission.node.1", "derp",
+		"some.awesome.permission.node", "<b>You must be awesome to %s<b>.",
-		"some.derp.permission.node.2", "derp",
+		"some.derp.permission.node.1", "derp",
-		"some.derp.permission.node.3", "derp",
+		"some.derp.permission.node.2", "derp",
-		"derp", "<b>Only derp people can %s<b>.\n<i>Ask a moderator to become derp."
+		"some.derp.permission.node.3", "derp",
-	);
+		"derp", "<b>Only derp people can %s<b>.\n<i>Ask a moderator to become derp."
-	
+	);
-	public String getPermissionDeniedFormat(String permissionName)
+	
-	{
+	public String getPermissionDeniedFormat(String permissionName)
-		Map<String, String> map = this.permissionDeniedFormats;
+	{
-		String ret = map.get(permissionName);
+		Map<String, String> map = this.permissionDeniedFormats;
-		if (ret == null) return null;
+		String ret = map.get(permissionName);
-		ret = MUtil.recurseResolveMap(ret, map);
+		if (ret == null) return null;
-		return ret;
+		ret = MUtil.recurseResolveMap(ret, map);
-	}
+		return ret;
-	
+	}
-	// -------------------------------------------- //
+	
-	// TP DELAY
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// TP DELAY
-	// Teleportation delay permissions.
+	// -------------------------------------------- //
-	
+	// Teleportation delay permissions.
-	public Map<String, Integer> permissionToTpdelay = MUtil.map(
+	
-		"massivecore.notpdelay", 0,
+	public Map<String, Integer> permissionToTpdelay = MUtil.map(
-		"default", 10
+		"massivecore.notpdelay", 0,
-	);
+		"default", 10
-	
+	);
-	public int getTpdelay(Permissible permissible)
+	
-	{
+	public int getTpdelay(Permissible permissible)
-		Integer ret = PermissionUtil.pickFirstVal(permissible, permissionToTpdelay);
+	{
-		if (ret == null) ret = 0;
+		Integer ret = PermissionUtil.pickFirstVal(permissible, permissionToTpdelay);
-		return ret;
+		if (ret == null) ret = 0;
-	}
+		return ret;
-	
+	}
-	// -------------------------------------------- //
+	
-	// DELETE FILES
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// DELETE FILES
-	// Delete certain files for system cleanliness.
+	// -------------------------------------------- //
-	
+	// Delete certain files for system cleanliness.
-	public List<String> deleteFiles = new ArrayList<>();
+	
-	
+	public List<String> deleteFiles = new ArrayList<>();
-	// -------------------------------------------- //
+	
-	// VARIABLES
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// VARIABLES
-	// Chat and command variables.
+	// -------------------------------------------- //
-	
+	// Chat and command variables.
-	public String variableBookName = "***book***";
+	
-	public boolean variableBookEnabled = true;
+	public String variableBookName = "***book***";
-	
+	public boolean variableBookEnabled = true;
-	public String variableBufferName = "***buffer***";
+	
-	public boolean variableBufferEnabled = true;
+	public String variableBufferName = "***buffer***";
-	
+	public boolean variableBufferEnabled = true;
-	// -------------------------------------------- //
+	
-	// CLICK
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// CLICK
-	// Button click sound configuration.
+	// -------------------------------------------- //
-	
+	// Button click sound configuration.
-	public SoundEffect clickSound = SoundEffect.valueOf("UI_BUTTON_CLICK", 0.75f, 1.0f);
+	
-	
+	public SoundEffect clickSound = SoundEffect.valueOf("UI_BUTTON_CLICK", 0.75f, 1.0f);
-	// -------------------------------------------- //
+	
-	// MSTORE
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// MSTORE
-	// The database system.
+	// -------------------------------------------- //
-	
+	// The database system.
-	@EditorType(TypeMillisDiff.class)
+	
-	public volatile long millisBetweenLocalPoll = TimeUnit.MILLIS_PER_MINUTE * 5;
+	@EditorType(TypeMillisDiff.class)
-	@EditorType(TypeMillisDiff.class)
+	public volatile long millisBetweenLocalPoll = TimeUnit.MILLIS_PER_MINUTE * 5;
-	public volatile long millisBetweenRemotePollWithoutPusher = TimeUnit.MILLIS_PER_SECOND * 10;
+	@EditorType(TypeMillisDiff.class)
-	@EditorType(TypeMillisDiff.class)
+	public volatile long millisBetweenRemotePollWithoutPusher = TimeUnit.MILLIS_PER_SECOND * 10;
-	public volatile long millisBetweenRemotePollWithPusher = TimeUnit.MILLIS_PER_MINUTE * 1;
+	@EditorType(TypeMillisDiff.class)
-	
+	public volatile long millisBetweenRemotePollWithPusher = TimeUnit.MILLIS_PER_MINUTE * 1;
-	@EditorType(TypeBooleanOn.class)
+	
-	public boolean warnOnLocalAlter = false;
+	@EditorType(TypeBooleanOn.class)
-
+	public boolean warnOnLocalAlter = false;
-	@EditorType(TypeBooleanOn.class)
+
-	public boolean advancedLocalPollingDebug = false;
+	@EditorType(TypeBooleanOn.class)
-	
+	public boolean advancedLocalPollingDebug = false;
-	// -------------------------------------------- //
+	
-	// CLEAN
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// CLEAN
-	
+	// -------------------------------------------- //
-	// How often should the task run?
+	
-	// When set to 0 this feature is disabled. Meaning no cleaning will be done.
+	// How often should the task run?
-	// Default: 1 day (Per default once a day.)
+	// When set to 0 this feature is disabled. Meaning no cleaning will be done.
-	public long cleanTaskPeriodMillis = TimeUnit.MILLIS_PER_DAY;
+	// Default: 1 day (Per default once a day.)
-	
+	public long cleanTaskPeriodMillis = TimeUnit.MILLIS_PER_DAY;
-	// This is used to decide at what time of the day the task will run.
+	
-	// For Example: If the taskPeriodMillis is 24 hours:
+	// This is used to decide at what time of the day the task will run.
-	// Set it to 0 for UTC midnight.
+	// For Example: If the taskPeriodMillis is 24 hours:
-	// Set it to 3600000 for UTC midnight + 1 hour.
+	// Set it to 0 for UTC midnight.
-	public long cleanTaskOffsetMillis = 0;
+	// Set it to 3600000 for UTC midnight + 1 hour.
-	
+	public long cleanTaskOffsetMillis = 0;
-	// When did the task last run?
+	
-	// This need not be modified by the server owner.
+	// When did the task last run?
-	// It will be set for you automatically.
+	// This need not be modified by the server owner.
-	// 0 means it never ran before.
+	// It will be set for you automatically.
-	public long cleanTaskLastMillis = 0;
+	// 0 means it never ran before.
-	
+	public long cleanTaskLastMillis = 0;
-	// -------------------------------------------- //
+	
-	// MONGODB
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// MONGODB
-	// The database system MongoDB driver.
+	// -------------------------------------------- //
-	
+	// The database system MongoDB driver.
-	public boolean catchingMongoDbErrorsOnSave = true;
+	
-	public boolean catchingMongoDbErrorsOnDelete = true;
+	public boolean catchingMongoDbErrorsOnSave = true;
-	
+	public boolean catchingMongoDbErrorsOnDelete = true;
-	public static WriteConcern getMongoDbWriteConcern(boolean catchingErrors) { return catchingErrors ? WriteConcern.ACKNOWLEDGED : WriteConcern.UNACKNOWLEDGED; }
+	
-	public WriteConcern getMongoDbWriteConcernSave() { return getMongoDbWriteConcern(this.catchingMongoDbErrorsOnSave); }
+	public static WriteConcern getMongoDbWriteConcern(boolean catchingErrors) { return catchingErrors ? WriteConcern.ACKNOWLEDGED : WriteConcern.UNACKNOWLEDGED; }
-	public WriteConcern getMongoDbWriteConcernDelete() { return getMongoDbWriteConcern(this.catchingMongoDbErrorsOnDelete); }
+	public WriteConcern getMongoDbWriteConcernSave() { return getMongoDbWriteConcern(this.catchingMongoDbErrorsOnSave); }
-	
+	public WriteConcern getMongoDbWriteConcernDelete() { return getMongoDbWriteConcern(this.catchingMongoDbErrorsOnDelete); }
-	// -------------------------------------------- //
+	
-	// DEVELOPER
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// DEVELOPER
-	
+	// -------------------------------------------- //
-	public boolean debugEnabled = false;
+	
-	
+	public boolean debugEnabled = false;
-	// -------------------------------------------- //
+	
-	// METRICS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// METRICS
-	// URL connections to https://bstats.org
+	// -------------------------------------------- //
-	
+	// URL connections to https://bstats.org
-	public boolean metricsEnabled = true;
+	
-
+	public boolean metricsEnabled = true;
-	// -------------------------------------------- //
+
-	// LORE SORTING
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// LORE SORTING
-
+	// -------------------------------------------- //
-	public boolean loreSortOnInventoryClick = false;
+
-	public boolean loreSortOnInventoryOpen = false;
+	public boolean loreSortOnInventoryClick = false;
-
+	public boolean loreSortOnInventoryOpen = false;
-	public Map<String, Integer> lorePrioritiesPrefix = new MassiveMap<>();
+
-	public Map<String, Integer> lorePrioritiesRegex = new MassiveMap<>();
+	public Map<String, Integer> lorePrioritiesPrefix = new MassiveMap<>();
-
+	public Map<String, Integer> lorePrioritiesRegex = new MassiveMap<>();
-}
+
+}

src/com/massivecraft/massivecore/entity/MassiveCoreMConfColl.java

@@ -1,42 +1,43 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.massivecraft.massivecore.store.Coll;
+import com.massivecraft.massivecore.MassiveCore;
-
+import com.massivecraft.massivecore.store.Coll;
-public class MassiveCoreMConfColl extends Coll<MassiveCoreMConf>
+
-{
+public class MassiveCoreMConfColl extends Coll<MassiveCoreMConf>
-	// -------------------------------------------- //
+{
-	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// INSTANCE & CONSTRUCT
-	
+	// -------------------------------------------- //
-	private static MassiveCoreMConfColl i = new MassiveCoreMConfColl();
+	
-	public static MassiveCoreMConfColl get() { return i; }
+	private static MassiveCoreMConfColl i = new MassiveCoreMConfColl();
-	private MassiveCoreMConfColl()
+	public static MassiveCoreMConfColl get() { return i; }
-	{
+	private MassiveCoreMConfColl()
-		super("massivecore_mconf");
+	{
-	}
+		super("massivecore_mconf");
-
+	}
-	// -------------------------------------------- //
+
-	// STACK TRACEABILITY
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// STACK TRACEABILITY
-	
+	// -------------------------------------------- //
-	@Override
+	
-	public void onTick()
+	@Override
-	{
+	public void onTick()
-		super.onTick();
+	{
-	}
+		super.onTick();
-	
+	}
-	// -------------------------------------------- //
+	
-	// OVERRIDE
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// OVERRIDE
-	
+	// -------------------------------------------- //
-	@Override
+	
-	public void setActive(boolean active)
+	@Override
-	{
+	public void setActive(boolean active)
-		super.setActive(active);
+	{
-		
+		super.setActive(active);
-		if ( ! active) return;
+		
-		
+		if ( ! active) return;
-		MassiveCoreMConf.i = this.get(MassiveCore.INSTANCE, true);
+		
-	}
+		MassiveCoreMConf.i = this.get(MassiveCore.INSTANCE, true);
-	
+	}
-}
+	
+}

src/com/massivecraft/massivecore/entity/Multiverse.java

@@ -1,186 +1,187 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.massivecraft.massivecore.command.type.TypeUniverse;
+import com.massivecraft.massivecore.MassiveCore;
-import com.massivecraft.massivecore.store.Entity;
+import com.massivecraft.massivecore.command.type.TypeUniverse;
-import com.massivecraft.massivecore.util.MUtil;
+import com.massivecraft.massivecore.store.Entity;
-
+import com.massivecraft.massivecore.util.MUtil;
-import java.util.HashMap;
+
-import java.util.HashSet;
+import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
-import java.util.Map;
+import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
-import java.util.Set;
+import java.util.Map.Entry;
-import java.util.TreeSet;
+import java.util.Set;
-
+import java.util.TreeSet;
-public class Multiverse extends Entity<Multiverse>
+
-{	
+public class Multiverse extends Entity<Multiverse>
-	// -------------------------------------------- //
+{	
-	// META
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// META
-	
+	// -------------------------------------------- //
-	public static Multiverse get(Object oid)
+	
-	{
+	public static Multiverse get(Object oid)
-		return MultiverseColl.get().get(oid);
+	{
-	}
+		return MultiverseColl.get().get(oid);
-	
+	}
-	// -------------------------------------------- //
+	
-	// FIELDS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// FIELDS
-	
+	// -------------------------------------------- //
-	protected Map<String, Set<String>> uw = new HashMap<>();
+	
-	
+	protected Map<String, Set<String>> uw = new HashMap<>();
-	
+	
-	// -------------------------------------------- //
+	
-	// CONSTRUCT
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// CONSTRUCT
-	
+	// -------------------------------------------- //
-	public Multiverse()
+	
-	{
+	public Multiverse()
-		
+	{
-	}
+		
-	
+	}
-	// -------------------------------------------- //
+	
-	// ASPECTS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// ASPECTS
-	
+	// -------------------------------------------- //
-	public List<Aspect> myAspects()
+	
-	{
+	public List<Aspect> myAspects()
-		return AspectColl.get().getAllRegisteredForMultiverse(this, true);
+	{
-	}
+		return AspectColl.get().getAllRegisteredForMultiverse(this, true);
-	
+	}
-	public List<Aspect> otherAspects()
+	
-	{
+	public List<Aspect> otherAspects()
-		return AspectColl.get().getAllRegisteredForMultiverse(this, false);
+	{
-	}
+		return AspectColl.get().getAllRegisteredForMultiverse(this, false);
-	
+	}
-	// -------------------------------------------- //
+	
-	// UNIVERSE
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// UNIVERSE
-	
+	// -------------------------------------------- //
-	public boolean containsUniverse(String universe)
+	
-	{
+	public boolean containsUniverse(String universe)
-		return this.getUniverses().contains(universe);
+	{
-	}
+		return this.getUniverses().contains(universe);
-	
+	}
-	public Set<String> newUniverse(String universe)
+	
-	{
+	public Set<String> newUniverse(String universe)
-		if (universe.equals(MassiveCore.DEFAULT)) return null;
+	{
-		Set<String> ret = this.uw.get(universe);
+		if (universe.equals(MassiveCore.DEFAULT)) return null;
-		if (ret == null)
+		Set<String> ret = this.uw.get(universe);
-		{
+		if (ret == null)
-			ret = new HashSet<>();
+		{
-			this.uw.put(universe, ret);
+			ret = new HashSet<>();
-			this.changed();
+			this.uw.put(universe, ret);
-		}
+			this.changed();
-		return ret;
+		}
-	}
+		return ret;
-	
+	}
-	public Set<String> delUniverse(String universe)
+	
-	{
+	public Set<String> delUniverse(String universe)
-		this.changed();
+	{
-		return this.uw.remove(universe);
+		this.changed();
-	}
+		return this.uw.remove(universe);
-	
+	}
-	public Set<String> getUniverses()
+	
-	{
+	public Set<String> getUniverses()
-		Set<String> ret = new TreeSet<>();
+	{
-		ret.addAll(this.uw.keySet());
+		Set<String> ret = new TreeSet<>();
-		ret.add(MassiveCore.DEFAULT);
+		ret.addAll(this.uw.keySet());
-		return ret;
+		ret.add(MassiveCore.DEFAULT);
-	}
+		return ret;
-	
+	}
-	public String getUniverseForWorldName(String worldName)
+	
-	{
+	public String getUniverseForWorldName(String worldName)
-		for (Entry<String, Set<String>> entry : this.uw.entrySet())
+	{
-		{
+		for (Entry<String, Set<String>> entry : this.uw.entrySet())
-			String universe = entry.getKey();
+		{
-			Set<String> worlds = entry.getValue();
+			String universe = entry.getKey();
-			if (worlds.contains(worldName)) return universe;
+			Set<String> worlds = entry.getValue();
-		}
+			if (worlds.contains(worldName)) return universe;
-		return MassiveCore.DEFAULT;
+		}
-	}
+		return MassiveCore.DEFAULT;
-	
+	}
-	public String getUniverse(Object worldNameExtractable)
+	
-	{
+	public String getUniverse(Object worldNameExtractable)
-		String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable);
+	{
-		return this.getUniverseForWorldName(worldName);
+		String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable);
-	}
+		return this.getUniverseForWorldName(worldName);
-	
+	}
-	// -------------------------------------------- //
+	
-	// UNIVERSE AND WORLD
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// UNIVERSE AND WORLD
-	
+	// -------------------------------------------- //
-	public boolean clearUniverse(String universe)
+	
-	{
+	public boolean clearUniverse(String universe)
-		Set<String> worlds = this.uw.get(universe);
+	{
-		if (worlds == null) return false;
+		Set<String> worlds = this.uw.get(universe);
-		worlds.clear();
+		if (worlds == null) return false;
-		this.changed();
+		worlds.clear();
-		return true;
+		this.changed();
-	}
+		return true;
-	
+	}
-	public boolean setWorldUniverse(String worldName, String universe)
+	
-	{
+	public boolean setWorldUniverse(String worldName, String universe)
-		if (this.getUniverseForWorldName(worldName).equals(universe)) return false;
+	{
-		this.removeWorld(worldName);
+		if (this.getUniverseForWorldName(worldName).equals(universe)) return false;
-		if ( ! universe.equals(MassiveCore.DEFAULT))
+		this.removeWorld(worldName);
-		{
+		if ( ! universe.equals(MassiveCore.DEFAULT))
-			this.newUniverse(universe).add(worldName);
+		{
-		}
+			this.newUniverse(universe).add(worldName);
-		this.changed();
+		}
-		return true;
+		this.changed();
-	}
+		return true;
-	
+	}
-	// -------------------------------------------- //
+	
-	// WORLD
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// WORLD
-	
+	// -------------------------------------------- //
-	public boolean containsWorld(String worldName)
+	
-	{
+	public boolean containsWorld(String worldName)
-		return this.getWorlds().contains(worldName);
+	{
-	}
+		return this.getWorlds().contains(worldName);
-	
+	}
-	public Set<String> getWorlds()
+	
-	{
+	public Set<String> getWorlds()
-		Set<String> ret = new TreeSet<>();
+	{
-		for (Set<String> uworlds : this.uw.values())
+		Set<String> ret = new TreeSet<>();
-		{
+		for (Set<String> uworlds : this.uw.values())
-			ret.addAll(uworlds);
+		{
-		}
+			ret.addAll(uworlds);
-		return ret;
+		}
-	}
+		return ret;
-	
+	}
-	public Set<String> getWorlds(String universe)
+	
-	{
+	public Set<String> getWorlds(String universe)
-		Set<String> orig = this.uw.get(universe);
+	{
-		if (orig == null) return null;
+		Set<String> orig = this.uw.get(universe);
-		
+		if (orig == null) return null;
-		Set<String> ret = new TreeSet<>();
+		
-		ret.addAll(orig);
+		Set<String> ret = new TreeSet<>();
-		
+		ret.addAll(orig);
-		return ret;
+		
-	}
+		return ret;
-	
+	}
-	public boolean removeWorld(String worldName)
+	
-	{
+	public boolean removeWorld(String worldName)
-		for (Set<String> worldNames : this.uw.values())
+	{
-		{
+		for (Set<String> worldNames : this.uw.values())
-			if (worldNames.remove(worldName))
+		{
-			{
+			if (worldNames.remove(worldName))
-				this.changed();
+			{
-				return true;
+				this.changed();
-			}
+				return true;
-		}
+			}
-		return false;
+		}
-	}
+		return false;
-	
+	}
-	// -------------------------------------------- //
+	
-	// ARG READERS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// ARG READERS
-	
+	// -------------------------------------------- //
-	public TypeUniverse typeUniverse()
+	
-	{
+	public TypeUniverse typeUniverse()
-		return new TypeUniverse(this);
+	{
-	}
+		return new TypeUniverse(this);
-	
+	}
-}
+	
+}

src/com/massivecraft/massivecore/entity/MultiverseColl.java

@@ -1,43 +1,44 @@
-package com.massivecraft.massivecore;
+package com.massivecraft.massivecore.entity;
-
+
-import com.massivecraft.massivecore.store.Coll;
+import com.massivecraft.massivecore.MassiveCore;
-
+import com.massivecraft.massivecore.store.Coll;
-public class MultiverseColl extends Coll<Multiverse>
+
-{
+public class MultiverseColl extends Coll<Multiverse>
-	// -------------------------------------------- //
+{
-	// INSTANCE & CONSTRUCT
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// INSTANCE & CONSTRUCT
-	
+	// -------------------------------------------- //
-	private static MultiverseColl i = new MultiverseColl();
+	
-	public static MultiverseColl get() { return i; }
+	private static MultiverseColl i = new MultiverseColl();
-	private MultiverseColl()
+	public static MultiverseColl get() { return i; }
-	{
+	private MultiverseColl()
-		super("massivecore_multiverse");
+	{
-	}
+		super("massivecore_multiverse");
-
+	}
-	// -------------------------------------------- //
+
-	// STACK TRACEABILITY
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// STACK TRACEABILITY
-	
+	// -------------------------------------------- //
-	@Override
+	
-	public void onTick()
+	@Override
-	{
+	public void onTick()
-		super.onTick();
+	{
-	}
+		super.onTick();
-	
+	}
-	// -------------------------------------------- //
+	
-	// EXTRAS
+	// -------------------------------------------- //
-	// -------------------------------------------- //
+	// EXTRAS
-	
+	// -------------------------------------------- //
-	@Override
+	
-	public void setActive(boolean active)
+	@Override
-	{
+	public void setActive(boolean active)
-		super.setActive(active);
+	{
-		
+		super.setActive(active);
-		if ( ! active) return;
+		
-		
+		if ( ! active) return;
-		// Ensure the default multiverse exits
+		
-		this.get(MassiveCore.DEFAULT, true);
+		// Ensure the default multiverse exits
-	}
+		this.get(MassiveCore.DEFAULT, true);
-	
+	}
-}
+	
+}

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;