Optimize Imports

src/com/massivecraft/massivecore/Aspect.java

@@ -1,12 +1,12 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.store.Entity;
+import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
-
 public class Aspect extends Entity<Aspect>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/AspectColl.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.store.Coll;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.massivecore.store.Coll;
-
 public class AspectColl extends Coll<Aspect>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/Button.java

@@ -1,12 +1,5 @@
 package com.massivecraft.massivecore;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.massivecore.CmdMassiveCore;
@@ -15,6 +8,12 @@ import com.massivecraft.massivecore.command.requirement.RequirementAbstract;
 import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.mson.MsonEvent;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static com.massivecraft.massivecore.mson.Mson.mson;
 

src/com/massivecraft/massivecore/ConfServer.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.util.MUtil;
+
 import java.util.Map;
 import java.util.UUID;
 
-import com.massivecraft.massivecore.util.MUtil;
-
 public class ConfServer extends SimpleConfig
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/Couple.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.util.MUtil;
+
 import java.io.Serializable;
 import java.util.Map.Entry;
 
-import com.massivecraft.massivecore.util.MUtil;
-
 public class Couple<A, B> implements Entry<A, B>, Cloneable, Serializable
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/Engine.java

@@ -1,7 +1,7 @@
 package com.massivecraft.massivecore;
 
-import java.util.Set;
+import com.massivecraft.massivecore.collections.MassiveSet;
-
+import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -11,8 +11,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.scheduler.BukkitTask;
 
-import com.massivecraft.massivecore.collections.MassiveSet;
+import java.util.Set;
-import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase;
 
 public abstract class Engine implements Active, Listener, Runnable
 {

src/com/massivecraft/massivecore/Integration.java

@@ -1,19 +1,18 @@
 package com.massivecraft.massivecore;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.predicate.Predicate;
 import com.massivecraft.massivecore.predicate.PredicateIntegration;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class Integration extends Engine
 {

src/com/massivecraft/massivecore/Lang.java

@@ -1,8 +1,8 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.mson.Mson;
 import org.bukkit.ChatColor;
 
-import com.massivecraft.massivecore.mson.Mson;
 import static com.massivecraft.massivecore.mson.Mson.mson;
 
 public class Lang

src/com/massivecraft/massivecore/MassiveCore.java

@@ -1,18 +1,5 @@
 package com.massivecraft.massivecore;
 
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Sound;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-
 import com.massivecraft.massivecore.adapter.AdapterBackstringSet;
 import com.massivecraft.massivecore.adapter.AdapterBannerPatterns;
 import com.massivecraft.massivecore.adapter.AdapterEntry;
@@ -126,6 +113,18 @@ import com.massivecraft.massivecore.xlib.gson.JsonNull;
 import com.massivecraft.massivecore.xlib.gson.JsonObject;
 import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import org.bukkit.Bukkit;
+import org.bukkit.Sound;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
 
 public class MassiveCore extends MassivePlugin
 {

src/com/massivecraft/massivecore/MassiveCoreMConf.java

@@ -1,11 +1,5 @@
 package com.massivecraft.massivecore;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.permissions.Permissible;
-
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.massivecraft.massivecore.command.editor.annotation.EditorName;
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
@@ -16,6 +10,11 @@ import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.PermissionUtil;
 import com.massivecraft.massivecore.util.TimeUnit;
 import com.massivecraft.massivecore.xlib.mongodb.WriteConcern;
+import org.bukkit.permissions.Permissible;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @EditorName("config")
 public class MassiveCoreMConf extends Entity<MassiveCoreMConf>

src/com/massivecraft/massivecore/MassiveCoreMConfColl.java

@@ -1,6 +1,5 @@
 package com.massivecraft.massivecore;
 
-import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.store.Coll;
 
 public class MassiveCoreMConfColl extends Coll<MassiveCoreMConf>

src/com/massivecraft/massivecore/MassiveCorePerm.java

@@ -1,8 +1,7 @@
 package com.massivecraft.massivecore;
 
-import org.bukkit.permissions.Permissible;
-
 import com.massivecraft.massivecore.util.PermissionUtil;
+import org.bukkit.permissions.Permissible;
 
 public enum MassiveCorePerm implements Identified
 {

src/com/massivecraft/massivecore/MassiveException.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.mson.Mson;
+
 import java.util.Arrays;
 import java.util.Collection;
 
-import com.massivecraft.massivecore.mson.Mson;
-
 
 public class MassiveException extends Exception
 {

src/com/massivecraft/massivecore/MassivePlugin.java

@@ -1,18 +1,5 @@
 package com.massivecraft.massivecore;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.store.Coll;
@@ -20,6 +7,18 @@ import com.massivecraft.massivecore.util.ReflectionUtil;
 import com.massivecraft.massivecore.util.Txt;
 import com.massivecraft.massivecore.xlib.gson.Gson;
 import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public abstract class MassivePlugin extends JavaPlugin implements Listener, Named
 {

src/com/massivecraft/massivecore/MetadataSimple.java

@@ -1,12 +1,12 @@
 package com.massivecraft.massivecore;
 
-import java.util.List;
-
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.metadata.MetadataValueAdapter;
 import org.bukkit.metadata.Metadatable;
 import org.bukkit.plugin.Plugin;
 
+import java.util.List;
+
 public class MetadataSimple extends MetadataValueAdapter
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/MetricsLite.java

@@ -28,6 +28,7 @@
 
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.util.MUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -35,8 +36,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.scheduler.BukkitTask;
 
-import com.massivecraft.massivecore.util.MUtil;
-
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

src/com/massivecraft/massivecore/Multiverse.java

@@ -1,5 +1,9 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.command.type.TypeUniverse;
+import com.massivecraft.massivecore.store.Entity;
+import com.massivecraft.massivecore.util.MUtil;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -8,10 +12,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.massivecraft.massivecore.command.type.TypeUniverse;
-import com.massivecraft.massivecore.store.Entity;
-import com.massivecraft.massivecore.util.MUtil;
-
 public class Multiverse extends Entity<Multiverse>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/PlayerState.java

@@ -1,10 +1,9 @@
 package com.massivecraft.massivecore;
 
-import java.util.UUID;
+import com.massivecraft.massivecore.engine.EngineMassiveCorePlayerState;
-
 import org.bukkit.entity.Player;
 
-import com.massivecraft.massivecore.engine.EngineMassiveCorePlayerState;
+import java.util.UUID;
 
 /**
  * This enumeration is used to keep track of where a player currently is within the login --> join --> play --> leave cycle.

src/com/massivecraft/massivecore/PotionEffectWrap.java

@@ -1,15 +1,14 @@
 package com.massivecraft.massivecore;
 
-import java.util.Collection;
-import java.util.List;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
 import com.massivecraft.massivecore.command.type.convert.TypeConverterPotionEffectType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
  * This class wraps the Bukkit PotionEffect class by reimplementing storage of the data.

src/com/massivecraft/massivecore/PriorityLines.java

@@ -1,15 +1,15 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.comparator.ComparatorIdentity;
+import com.massivecraft.massivecore.comparator.ComparatorPrioritized;
+import com.massivecraft.massivecore.util.MUtil;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
-import com.massivecraft.massivecore.comparator.ComparatorIdentity;
-import com.massivecraft.massivecore.comparator.ComparatorPrioritized;
-import com.massivecraft.massivecore.util.MUtil;
-
 public class PriorityLines implements Prioritized, Comparable<PriorityLines>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/Progressbar.java

@@ -1,14 +1,14 @@
 package com.massivecraft.massivecore;
 
+import com.massivecraft.massivecore.util.MUtil;
+import com.massivecraft.massivecore.util.Txt;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.massivecore.util.Txt;
-
 public class Progressbar
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/SimpleConfig.java

@@ -1,12 +1,11 @@
 package com.massivecraft.massivecore;
 
-import java.io.File;
-
-import org.bukkit.plugin.Plugin;
-
 import com.massivecraft.massivecore.store.accessor.Accessor;
 import com.massivecraft.massivecore.util.DiscUtil;
 import com.massivecraft.massivecore.xlib.gson.Gson;
+import org.bukkit.plugin.Plugin;
+
+import java.io.File;
 
 public class SimpleConfig
 {

src/com/massivecraft/massivecore/SoundEffect.java

@@ -1,19 +1,18 @@
 package com.massivecraft.massivecore;
 
-import java.io.Serializable;
-import java.util.Collection;
-
-import org.bukkit.Location;
-import org.bukkit.Sound;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.command.editor.annotation.EditorName;
 import com.massivecraft.massivecore.command.editor.annotation.EditorNullable;
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
 import com.massivecraft.massivecore.command.type.enumeration.TypeSound;
 import com.massivecraft.massivecore.command.type.enumeration.TypeSoundId;
 import com.massivecraft.massivecore.util.MUtil;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+
+import java.io.Serializable;
+import java.util.Collection;
 
 public final class SoundEffect implements Serializable
 {

src/com/massivecraft/massivecore/Triple.java

@@ -1,9 +1,9 @@
 package com.massivecraft.massivecore;
 
-import java.io.Serializable;
-
 import com.massivecraft.massivecore.util.MUtil;
 
+import java.io.Serializable;
+
 public class Triple<A, B, C> implements Cloneable, Serializable
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java

@@ -1,9 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Set;
-
 import com.massivecraft.massivecore.collections.BackstringSet;
 import com.massivecraft.massivecore.command.type.RegistryType;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
@@ -14,6 +10,10 @@ import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Set;
+
 public class AdapterBackstringSet implements JsonDeserializer<BackstringSet<?>>, JsonSerializer<BackstringSet<?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java

@@ -1,8 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Iterator;
-
 import com.massivecraft.massivecore.collections.MassiveListDef;
 import com.massivecraft.massivecore.item.DataBannerPattern;
 import com.massivecraft.massivecore.xlib.gson.JsonArray;
@@ -13,6 +10,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonNull;
 import com.massivecraft.massivecore.xlib.gson.JsonObject;
 import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 
+import java.lang.reflect.Type;
+import java.util.Iterator;
+
 public class AdapterBannerPatterns implements JsonDeserializer<MassiveListDef<DataBannerPattern>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterEntry.java

@@ -1,10 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Map.Entry;
-import java.util.AbstractMap.SimpleEntry;
-
 import com.massivecraft.massivecore.xlib.gson.JsonArray;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
@@ -14,6 +9,11 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Map.Entry;
+
 public class AdapterEntry implements JsonDeserializer<Entry<?, ?>>, JsonSerializer<Entry<?, ?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterInventory.java

@@ -1,13 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Map.Entry;
-
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.item.DataItemStack;
 import com.massivecraft.massivecore.mixin.MixinInventory;
@@ -19,6 +11,13 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Map.Entry;
 
 /**
  * This is my Gson adapter for Inventories.

src/com/massivecraft/massivecore/adapter/AdapterItemStack.java

@@ -1,8 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import org.bukkit.inventory.ItemStack;
-
 import com.massivecraft.massivecore.item.DataItemStack;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
@@ -10,6 +7,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonElement;
 import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import org.bukkit.inventory.ItemStack;
+
+import java.lang.reflect.Type;
 
 /**
  * This is a GSON serializer/deserializer for the Bukkit ItemStack. Why not use

src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
@@ -9,6 +7,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterJsonElement implements JsonDeserializer<JsonElement>, JsonSerializer<JsonElement>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterLowercaseEnum<T extends Enum<T>> implements JsonDeserializer<T>, JsonSerializer<T>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Collection;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.collections.MassiveListDef;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 
+import java.lang.reflect.Type;
+import java.util.Collection;
+
 public class AdapterMassiveList extends AdapterMassiveX<MassiveList<?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Map;
-
 import com.massivecraft.massivecore.collections.MassiveMap;
 import com.massivecraft.massivecore.collections.MassiveMapDef;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 
+import java.lang.reflect.Type;
+import java.util.Map;
+
 public class AdapterMassiveMap extends AdapterMassiveX<MassiveMap<?, ?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Collection;
-
 import com.massivecraft.massivecore.collections.MassiveSet;
 import com.massivecraft.massivecore.collections.MassiveSetDef;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 
+import java.lang.reflect.Type;
+import java.util.Collection;
+
 public class AdapterMassiveSet extends AdapterMassiveX<MassiveSet<?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Map;
-
 import com.massivecraft.massivecore.collections.MassiveTreeMap;
 import com.massivecraft.massivecore.collections.MassiveTreeMapDef;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 
+import java.lang.reflect.Type;
+import java.util.Map;
+
 public class AdapterMassiveTreeMap extends AdapterMassiveX<MassiveTreeMap<?, ?, ?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.Collection;
-
 import com.massivecraft.massivecore.collections.MassiveTreeSet;
 import com.massivecraft.massivecore.collections.MassiveTreeSetDef;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 
+import java.lang.reflect.Type;
+import java.util.Collection;
+
 public class AdapterMassiveTreeSet extends AdapterMassiveX<MassiveTreeSet<?, ?>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java

@@ -1,11 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
 import com.massivecraft.massivecore.collections.Def;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
@@ -16,6 +10,12 @@ import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Types;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
 /**
  * This is the abstract adapter for all "Massive structures".
  * It makes sure Def instances "handle empty as null".

src/com/massivecraft/massivecore/adapter/AdapterMson.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
@@ -10,6 +8,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterMson implements JsonDeserializer<Mson>, JsonSerializer<Mson>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.mson.MsonEvent;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
@@ -10,6 +8,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterMsonEvent implements JsonDeserializer<MsonEvent>, JsonSerializer<MsonEvent>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.mson.MsonEvent;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterMsonEventFix implements JsonDeserializer<MsonEvent>, JsonSerializer<MsonEvent>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java

@@ -1,15 +1,14 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
-import org.bukkit.inventory.PlayerInventory;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
 import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import org.bukkit.inventory.PlayerInventory;
+
+import java.lang.reflect.Type;
 
 public class AdapterPlayerInventory implements JsonDeserializer<PlayerInventory>, JsonSerializer<PlayerInventory>
 {

src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
@@ -12,6 +10,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+
 public class AdapterPolymorphic<T> implements JsonDeserializer<T>, JsonSerializer<T>
 {
 	public static final String TYPE = "type";

src/com/massivecraft/massivecore/adapter/AdapterSound.java

@@ -1,9 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-
-import org.bukkit.Sound;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
@@ -12,6 +8,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonParseException;
 import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import org.bukkit.Sound;
+
+import java.lang.reflect.Type;
 
 public class AdapterSound implements JsonDeserializer<Sound>, JsonSerializer<Sound>
 {

src/com/massivecraft/massivecore/adapter/AdapterUUID.java

@@ -1,8 +1,5 @@
 package com.massivecraft.massivecore.adapter;
 
-import java.lang.reflect.Type;
-import java.util.UUID;
-
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
 import com.massivecraft.massivecore.xlib.gson.JsonElement;
@@ -11,6 +8,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
 import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
 
+import java.lang.reflect.Type;
+import java.util.UUID;
+
 public class AdapterUUID implements JsonDeserializer<UUID>, JsonSerializer<UUID>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/chestgui/ChestActionAbstract.java

@@ -1,10 +1,9 @@
 package com.massivecraft.massivecore.chestgui;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryClickEvent;
-
 import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.MUtil;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
 
 public class ChestActionAbstract implements ChestAction
 {

src/com/massivecraft/massivecore/chestgui/ChestActionCommand.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.chestgui;
 
-import java.security.InvalidParameterException;
+import com.massivecraft.massivecore.mixin.MixinCommand;
-
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
-import com.massivecraft.massivecore.mixin.MixinCommand;
+import java.security.InvalidParameterException;
 
 public class ChestActionCommand extends ChestActionAbstract
 {

src/com/massivecraft/massivecore/chestgui/ChestGui.java

@@ -1,15 +1,14 @@
 package com.massivecraft.massivecore.chestgui;
 
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.SoundEffect;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.collections.MassiveMap;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+import java.util.Map;
 
 public class ChestGui
 {

src/com/massivecraft/massivecore/collections/ExceptionSet.java

@@ -1,14 +1,14 @@
 package com.massivecraft.massivecore.collections;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Objects;
-
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
 import com.massivecraft.massivecore.command.type.container.TypeMassiveTreeSetInsensitive;
 import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive;
 import com.massivecraft.massivecore.util.MUtil;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+
 public class ExceptionSet
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/collections/WorldExceptionSet.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.collections;
 
+import com.massivecraft.massivecore.ps.PS;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 
-import com.massivecraft.massivecore.ps.PS;
-
 public class WorldExceptionSet extends ExceptionSet
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/MassiveCommand.java

@@ -1,22 +1,5 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginIdentifiableCommand;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import com.massivecraft.massivecore.Active;
 import com.massivecraft.massivecore.Lang;
 import com.massivecraft.massivecore.MassiveException;
@@ -35,6 +18,22 @@ import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.PermissionUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginIdentifiableCommand;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public class MassiveCommand implements Active, PluginIdentifiableCommand
 {

src/com/massivecraft/massivecore/command/MassiveCommandHelp.java

@@ -1,15 +1,14 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
 
 public class MassiveCommandHelp extends MassiveCommand
 {

src/com/massivecraft/massivecore/command/MassiveCommandSet.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.Type;
 import com.massivecraft.massivecore.command.type.sender.TypeSenderId;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.PermissionUtil;
 import com.massivecraft.massivecore.util.Txt;
 
+import java.util.List;
+
 public abstract class MassiveCommandSet<T> extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/MassiveCommandToggle.java

@@ -1,11 +1,11 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeBooleanOn;
 import com.massivecraft.massivecore.util.Txt;
 
+import java.util.List;
+
 public abstract class MassiveCommandToggle extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/MassiveCommandVersion.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.List;
+import com.massivecraft.massivecore.util.Txt;
-
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 
-import com.massivecraft.massivecore.util.Txt;
+import java.util.List;
 
 public class MassiveCommandVersion extends MassiveCommand
 {

src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java

@@ -1,20 +1,19 @@
 package com.massivecraft.massivecore.command;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginIdentifiableCommand;
-import org.bukkit.plugin.Plugin;
-
 import com.massivecraft.massivecore.Lang;
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.mixin.MixinMessage;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginIdentifiableCommand;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class MassiveCoreBukkitCommand extends Command implements PluginIdentifiableCommand
 {

src/com/massivecraft/massivecore/command/Parameter.java

@@ -1,13 +1,12 @@
 package com.massivecraft.massivecore.command;
 
-import static com.massivecraft.massivecore.mson.Mson.mson;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.command.type.Type;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 import com.massivecraft.massivecore.mson.Mson;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import static com.massivecraft.massivecore.mson.Mson.mson;
 
 public class Parameter<T>
 {

src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java

@@ -1,11 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.MassiveCommand;
@@ -16,6 +10,11 @@ import com.massivecraft.massivecore.event.EventMassiveCoreEditorEdit;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+import java.util.Map.Entry;
 
 public class CommandEditAbstract<O, V> extends MassiveCommand
 {

src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java

@@ -1,13 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.AbstractMap.SimpleImmutableEntry;
-
-import org.bukkit.ChatColor;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.requirement.RequirementEditorPropertyCreated;
@@ -16,6 +8,12 @@ import com.massivecraft.massivecore.command.type.TypeNullable;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.ContainerUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.ChatColor;
+
+import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbstract<O, V>
 {

src/com/massivecraft/massivecore/command/editor/CommandEditContainerInsert.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 
+import java.util.List;
+
 public class CommandEditContainerInsert<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditContainerMove.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 
+import java.util.List;
+
 public class CommandEditContainerMove<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemove.java

@@ -1,13 +1,13 @@
 package com.massivecraft.massivecore.command.editor;
 
+import com.massivecraft.massivecore.MassiveException;
+import com.massivecraft.massivecore.util.MUtil;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.util.MUtil;
-
 public class CommandEditContainerRemove<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemoveIndex.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 
+import java.util.List;
+
 public class CommandEditContainerRemoveIndex<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditContainerSet.java

@@ -1,10 +1,10 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 
+import java.util.List;
+
 public class CommandEditContainerSet<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditContainerSwap.java

@@ -1,11 +1,11 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
 
+import java.util.Collections;
+import java.util.List;
+
 public class CommandEditContainerSwap<O, V> extends CommandEditContainerAbstract<O, V>
 {	
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java

@@ -1,9 +1,9 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
+
 public class CommandEditItemStacks<O> extends CommandEditAbstract<O, List<ItemStack>>
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksAbstract.java

@@ -1,10 +1,9 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
+import com.massivecraft.massivecore.command.requirement.RequirementEditorPropertyCreated;
-
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.massivecore.command.requirement.RequirementEditorPropertyCreated;
+import java.util.List;
 
 public abstract class CommandEditItemStacksAbstract<O> extends CommandEditAbstract<O, List<ItemStack>>
 {

src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java

@@ -1,18 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
@@ -21,6 +8,18 @@ import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
 import com.massivecraft.massivecore.mixin.MixinInventory;
 import com.massivecraft.massivecore.util.InventoryUtil;
 import com.massivecraft.massivecore.util.MUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
 public class CommandEditItemStacksOpen<O> extends CommandEditItemStacksAbstract<O> implements Listener
 {	

src/com/massivecraft/massivecore/command/editor/EditSettings.java

@@ -1,12 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.requirement.Requirement;
@@ -14,6 +7,12 @@ import com.massivecraft.massivecore.command.type.Type;
 import com.massivecraft.massivecore.command.type.sender.TypeSender;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 
 public class EditSettings<O>
 {

src/com/massivecraft/massivecore/command/editor/Property.java

@@ -1,16 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map.Entry;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.Named;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.requirement.Requirement;
@@ -18,6 +7,16 @@ import com.massivecraft.massivecore.command.type.Type;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.store.Entity;
 import com.massivecraft.massivecore.util.MUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map.Entry;
 
 public abstract class Property<O, V> implements Named
 {

src/com/massivecraft/massivecore/command/editor/PropertyReflection.java

@@ -1,14 +1,5 @@
 package com.massivecraft.massivecore.command.editor;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.command.editor.annotation.EditorEditable;
 import com.massivecraft.massivecore.command.editor.annotation.EditorInheritable;
@@ -23,6 +14,14 @@ import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.particleeffect.ReflectionUtils;
 import com.massivecraft.massivecore.util.ReflectionUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.List;
 
 public class PropertyReflection<O, V> extends Property<O, V>
 {

src/com/massivecraft/massivecore/command/editor/PropertyThisSenderEntity.java

@@ -1,10 +1,9 @@
 package com.massivecraft.massivecore.command.editor;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.type.sender.TypeSender;
 import com.massivecraft.massivecore.store.SenderColl;
 import com.massivecraft.massivecore.store.SenderEntity;
+import org.bukkit.command.CommandSender;
 
 public class PropertyThisSenderEntity<O extends SenderEntity<O>> extends Property<CommandSender, O>
 {

src/com/massivecraft/massivecore/command/editor/PropertyUsed.java

@@ -1,8 +1,7 @@
 package com.massivecraft.massivecore.command.editor;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.type.sender.TypeSender;
+import org.bukkit.command.CommandSender;
 
 public class PropertyUsed<V> extends Property<CommandSender, V>
 {

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCore.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
 import com.massivecraft.massivecore.command.editor.CommandEditSingleton;
 import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 
+import java.util.List;
+
 public class CmdMassiveCore extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreBuffer.java

@@ -1,12 +1,12 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 
+import java.util.List;
+
 public class CmdMassiveCoreBuffer extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreCmdurl.java

@@ -1,12 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
@@ -17,6 +10,12 @@ import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
 import com.massivecraft.massivecore.command.type.primitive.TypeString;
 import com.massivecraft.massivecore.mixin.MixinMessage;
 import com.massivecraft.massivecore.util.WebUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
 
 public class CmdMassiveCoreCmdurl extends MassiveCommand
 {

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreHearsound.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.SoundEffect;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
 import com.massivecraft.massivecore.command.type.combined.TypeSoundEffect;
 import com.massivecraft.massivecore.command.type.container.TypeList;
 
+import java.util.List;
+
 public class CmdMassiveCoreHearsound extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStore.java

@@ -1,12 +1,12 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 
+import java.util.List;
+
 public class CmdMassiveCoreStore extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreCopydb.java

@@ -1,9 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.MassiveException;
@@ -16,6 +12,10 @@ import com.massivecraft.massivecore.store.Entity;
 import com.massivecraft.massivecore.store.MStore;
 import com.massivecraft.massivecore.xlib.gson.JsonObject;
 
+import java.util.Collection;
+import java.util.Map.Entry;
+import java.util.Set;
+
 public class CmdMassiveCoreStoreCopydb extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java

@@ -1,8 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.Set;
-import java.util.TreeSet;
-
 import com.massivecraft.massivecore.ConfServer;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.MassiveException;
@@ -15,6 +12,9 @@ import com.massivecraft.massivecore.store.Db;
 import com.massivecraft.massivecore.store.MStore;
 import com.massivecraft.massivecore.util.Txt;
 
+import java.util.Set;
+import java.util.TreeSet;
+
 public class CmdMassiveCoreStoreListcolls extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreStats.java

@@ -1,7 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.Map.Entry;
-
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.MassiveCommand;
@@ -11,6 +9,8 @@ import com.massivecraft.massivecore.store.Coll;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
 
+import java.util.Map.Entry;
+
 public class CmdMassiveCoreStoreStats extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreTest.java

@@ -1,11 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
@@ -17,6 +11,11 @@ import com.massivecraft.massivecore.command.type.TypeItemStack;
 import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.InventoryUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
 
 public class CmdMassiveCoreTest extends MassiveCommand
 {

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsys.java

@@ -1,12 +1,12 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.List;
-
 import com.massivecraft.massivecore.MassiveCoreMConf;
 import com.massivecraft.massivecore.MassiveCorePerm;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 
+import java.util.List;
+
 public class CmdMassiveCoreUsys extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java

@@ -1,8 +1,5 @@
 package com.massivecraft.massivecore.command.massivecore;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.massivecraft.massivecore.Aspect;
 import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.MassiveCorePerm;
@@ -13,6 +10,9 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;
 import com.massivecraft.massivecore.util.Txt;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CmdMassiveCoreUsysMultiverseShow extends MassiveCommand
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/requirement/Requirement.java

@@ -1,9 +1,8 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.predicate.Predicate;
+import org.bukkit.command.CommandSender;
 
 public interface Requirement extends Predicate<CommandSender>
 {

src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import java.io.Serializable;
-
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.mixin.MixinMessage;
+import org.bukkit.command.CommandSender;
+
+import java.io.Serializable;
 
 public abstract class RequirementAbstract implements Requirement, Serializable
 {

src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java

@@ -1,15 +1,14 @@
 package com.massivecraft.massivecore.command.requirement;
 
+import com.massivecraft.massivecore.command.MassiveCommand;
+import org.bukkit.command.CommandSender;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.bukkit.command.CommandSender;
-
-import com.massivecraft.massivecore.command.MassiveCommand;
-
 public class RequirementAnd extends RequirementAbstract
 {
 	private static final long serialVersionUID = 1L;

src/com/massivecraft/massivecore/command/requirement/RequirementEditorPropertyCreated.java

@@ -1,12 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
 import com.massivecraft.massivecore.command.editor.Property;
-import com.massivecraft.massivecore.command.requirement.RequirementAbstract;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
 
 public class RequirementEditorPropertyCreated extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementEditorUse.java

@@ -1,9 +1,9 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
 
 public class RequirementEditorUse extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementHasItemInHand.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.command.type.TypeItemStack;
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
 
 public class RequirementHasItemInHand extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java

@@ -1,9 +1,8 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.util.PermissionUtil;
+import org.bukkit.command.CommandSender;
 
 public class RequirementHasPerm extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementIsPlayer.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.Lang;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class RequirementIsPlayer extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementIsntCertainSender.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.mixin.MixinDisplayName;
 import com.massivecraft.massivecore.util.IdUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
 
 public class RequirementIsntCertainSender extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementIsntPlayer.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.massivecraft.massivecore.Lang;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class RequirementIsntPlayer extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/requirement/RequirementTitlesAvailable.java

@@ -1,11 +1,10 @@
 package com.massivecraft.massivecore.command.requirement;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.Lang;
 import com.massivecraft.massivecore.command.MassiveCommand;
 import com.massivecraft.massivecore.mixin.MixinTitle;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
 
 public class RequirementTitlesAvailable extends RequirementAbstract
 {

src/com/massivecraft/massivecore/command/type/RegistryType.java

@@ -1,11 +1,5 @@
 package com.massivecraft.massivecore.command.type;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.massivecraft.massivecore.collections.BackstringSet;
 import com.massivecraft.massivecore.collections.ExceptionSet;
 import com.massivecraft.massivecore.collections.MassiveList;
@@ -59,6 +53,12 @@ import com.massivecraft.massivecore.command.type.store.TypeAspect;
 import com.massivecraft.massivecore.command.type.store.TypeMultiverse;
 import com.massivecraft.massivecore.util.ReflectionUtil;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class RegistryType
 {
 	// -------------------------------------------- //

src/com/massivecraft/massivecore/command/type/Type.java

@@ -1,19 +1,18 @@
 package com.massivecraft.massivecore.command.type;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.Named;
 import com.massivecraft.massivecore.command.editor.CommandEditAbstract;
 import com.massivecraft.massivecore.command.editor.EditSettings;
 import com.massivecraft.massivecore.command.editor.Property;
 import com.massivecraft.massivecore.mson.Mson;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 
 public interface Type<T> extends Named
 {

src/com/massivecraft/massivecore/command/type/TypeAbstract.java

@@ -1,19 +1,5 @@
 package com.massivecraft.massivecore.command.type;
 
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.Colorized;
 import com.massivecraft.massivecore.Identified;
 import com.massivecraft.massivecore.MassiveException;
@@ -32,6 +18,19 @@ import com.massivecraft.massivecore.util.ContainerUtil;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.ReflectionUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
 
 public abstract class TypeAbstract<T> implements Type<T>
 {

src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java

@@ -1,17 +1,5 @@
 package com.massivecraft.massivecore.command.type;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.collections.MassiveMap;
@@ -22,6 +10,17 @@ import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive;
 import com.massivecraft.massivecore.mson.Mson;
 import com.massivecraft.massivecore.util.ReflectionUtil;
 import com.massivecraft.massivecore.util.Txt;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.command.CommandSender;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Pattern;
 
 public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements AllAble<T>
 {

src/com/massivecraft/massivecore/command/type/TypeAbstractException.java

@@ -1,9 +1,8 @@
 package com.massivecraft.massivecore.command.type;
 
-import org.bukkit.command.CommandSender;
-
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.util.Txt;
+import org.bukkit.command.CommandSender;
 
 public abstract class TypeAbstractException<T> extends TypeAbstract<T>
 {

src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java

@@ -1,17 +1,16 @@
 package com.massivecraft.massivecore.command.type;
 
+import com.massivecraft.massivecore.MassiveException;
+import com.massivecraft.massivecore.command.type.container.AllAble;
+import com.massivecraft.massivecore.util.Txt;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.command.CommandSender;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.command.CommandSender;
-
-import com.massivecraft.massivecore.MassiveException;
-import com.massivecraft.massivecore.command.type.container.AllAble;
-import com.massivecraft.massivecore.util.Txt;
-
 public abstract class TypeAbstractSelect<T> extends TypeAbstract<T> implements AllAble<T>
 {
 	// -------------------------------------------- //