diff --git a/src/com/massivecraft/massivecore/Aspect.java b/src/com/massivecraft/massivecore/Aspect.java index c73e08b8..e2e532a6 100644 --- a/src/com/massivecraft/massivecore/Aspect.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/AspectColl.java b/src/com/massivecraft/massivecore/AspectColl.java index 6ae5bcd3..765074f8 100644 --- a/src/com/massivecraft/massivecore/AspectColl.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/Button.java b/src/com/massivecraft/massivecore/Button.java index 4bfe93a2..3298a807 100644 --- a/src/com/massivecraft/massivecore/Button.java +++ b/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; diff --git a/src/com/massivecraft/massivecore/ConfServer.java b/src/com/massivecraft/massivecore/ConfServer.java index 4d1f659a..34784a8e 100644 --- a/src/com/massivecraft/massivecore/ConfServer.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/Couple.java b/src/com/massivecraft/massivecore/Couple.java index c969d5a8..ede058a4 100644 --- a/src/com/massivecraft/massivecore/Couple.java +++ b/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 implements Entry, Cloneable, Serializable { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/Engine.java b/src/com/massivecraft/massivecore/Engine.java index 0d427848..86d3e631 100644 --- a/src/com/massivecraft/massivecore/Engine.java +++ b/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 com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; +import java.util.Set; public abstract class Engine implements Active, Listener, Runnable { diff --git a/src/com/massivecraft/massivecore/Integration.java b/src/com/massivecraft/massivecore/Integration.java index 7204e1c2..56cb3644 100644 --- a/src/com/massivecraft/massivecore/Integration.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/Lang.java b/src/com/massivecraft/massivecore/Lang.java index 69bc511d..bd6ea0a9 100644 --- a/src/com/massivecraft/massivecore/Lang.java +++ b/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 diff --git a/src/com/massivecraft/massivecore/MassiveCore.java b/src/com/massivecraft/massivecore/MassiveCore.java index d114e574..5ee0cae5 100644 --- a/src/com/massivecraft/massivecore/MassiveCore.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java index 075aa88d..c3978aa0 100644 --- a/src/com/massivecraft/massivecore/MassiveCoreMConf.java +++ b/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 diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java b/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java index d8c5bacc..f2878047 100644 --- a/src/com/massivecraft/massivecore/MassiveCoreMConfColl.java +++ b/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 diff --git a/src/com/massivecraft/massivecore/MassiveCorePerm.java b/src/com/massivecraft/massivecore/MassiveCorePerm.java index 3d028628..95fe23b1 100644 --- a/src/com/massivecraft/massivecore/MassiveCorePerm.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/MassiveException.java b/src/com/massivecraft/massivecore/MassiveException.java index 6b440fba..9470f6ea 100644 --- a/src/com/massivecraft/massivecore/MassiveException.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/MassivePlugin.java b/src/com/massivecraft/massivecore/MassivePlugin.java index 95ed8567..0ebf2b53 100644 --- a/src/com/massivecraft/massivecore/MassivePlugin.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/MetadataSimple.java b/src/com/massivecraft/massivecore/MetadataSimple.java index 5f924c1a..ff54c6d3 100644 --- a/src/com/massivecraft/massivecore/MetadataSimple.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/MetricsLite.java b/src/com/massivecraft/massivecore/MetricsLite.java index d0307616..29dfe3bc 100644 --- a/src/com/massivecraft/massivecore/MetricsLite.java +++ b/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; diff --git a/src/com/massivecraft/massivecore/Multiverse.java b/src/com/massivecraft/massivecore/Multiverse.java index f476c61c..cdaed9c9 100644 --- a/src/com/massivecraft/massivecore/Multiverse.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/PlayerState.java b/src/com/massivecraft/massivecore/PlayerState.java index 05fbb6c9..4b2bb8c4 100644 --- a/src/com/massivecraft/massivecore/PlayerState.java +++ b/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. diff --git a/src/com/massivecraft/massivecore/PotionEffectWrap.java b/src/com/massivecraft/massivecore/PotionEffectWrap.java index d1928e29..118a6183 100644 --- a/src/com/massivecraft/massivecore/PotionEffectWrap.java +++ b/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. diff --git a/src/com/massivecraft/massivecore/PriorityLines.java b/src/com/massivecraft/massivecore/PriorityLines.java index c3a3f584..36646183 100644 --- a/src/com/massivecraft/massivecore/PriorityLines.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/Progressbar.java b/src/com/massivecraft/massivecore/Progressbar.java index 9f56106c..ecfda517 100644 --- a/src/com/massivecraft/massivecore/Progressbar.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/SimpleConfig.java b/src/com/massivecraft/massivecore/SimpleConfig.java index f512a97e..b216fcfc 100644 --- a/src/com/massivecraft/massivecore/SimpleConfig.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/SoundEffect.java b/src/com/massivecraft/massivecore/SoundEffect.java index b802d475..38bbbe5c 100644 --- a/src/com/massivecraft/massivecore/SoundEffect.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/Triple.java b/src/com/massivecraft/massivecore/Triple.java index 2644a0f6..3311117e 100644 --- a/src/com/massivecraft/massivecore/Triple.java +++ b/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 implements Cloneable, Serializable { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java b/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java index 9bdd111d..9322c4c5 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterBackstringSet.java +++ b/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>, JsonSerializer> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java b/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java index 42f263dd..a8b042c1 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterBannerPatterns.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java b/src/com/massivecraft/massivecore/adapter/AdapterEntry.java index 2d5e571d..ed7e95a2 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java +++ b/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>, JsonSerializer> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterInventory.java b/src/com/massivecraft/massivecore/adapter/AdapterInventory.java index be05730b..7f4e2a8c 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterInventory.java +++ b/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. diff --git a/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java b/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java index e915a1b8..638d847c 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterItemStack.java +++ b/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 diff --git a/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java b/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java index 71148a59..c117aca8 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterJsonElement.java +++ b/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, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java b/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java index 57c2680c..20cecaa9 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java +++ b/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> implements JsonDeserializer, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java index eaea99c6..ea6b14e2 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveList.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java index 9ab5b554..eabc1516 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveMap.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java index dfc9fe7b..bb3a2237 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveSet.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java index fdd0c787..2492e74c 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeMap.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java index b4ede2bd..056b52ad 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveTreeSet.java +++ b/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> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java b/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java index 73fafbf8..fa88dad8 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMassiveX.java +++ b/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". diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMson.java b/src/com/massivecraft/massivecore/adapter/AdapterMson.java index f73cf616..0d377c40 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMson.java +++ b/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, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java b/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java index e570bd3d..7bb52643 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMsonEvent.java +++ b/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, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java b/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java index fbf62053..9969be79 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterMsonEventFix.java +++ b/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, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java b/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java index 83189d86..3e8e47c4 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterPlayerInventory.java +++ b/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, JsonSerializer { diff --git a/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java b/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java index aa6b99c7..e57c9a99 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterPolymorphic.java +++ b/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 implements JsonDeserializer, JsonSerializer { public static final String TYPE = "type"; diff --git a/src/com/massivecraft/massivecore/adapter/AdapterSound.java b/src/com/massivecraft/massivecore/adapter/AdapterSound.java index d246e790..8d2c3e5e 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterSound.java +++ b/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, JsonSerializer { diff --git a/src/com/massivecraft/massivecore/adapter/AdapterUUID.java b/src/com/massivecraft/massivecore/adapter/AdapterUUID.java index 5b2185eb..928aa6f0 100644 --- a/src/com/massivecraft/massivecore/adapter/AdapterUUID.java +++ b/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, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/chestgui/ChestActionAbstract.java b/src/com/massivecraft/massivecore/chestgui/ChestActionAbstract.java index d58e9cc4..0fde511d 100644 --- a/src/com/massivecraft/massivecore/chestgui/ChestActionAbstract.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/chestgui/ChestActionCommand.java b/src/com/massivecraft/massivecore/chestgui/ChestActionCommand.java index c99072b3..3c1127ee 100644 --- a/src/com/massivecraft/massivecore/chestgui/ChestActionCommand.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/chestgui/ChestGui.java b/src/com/massivecraft/massivecore/chestgui/ChestGui.java index 0759572b..47178095 100644 --- a/src/com/massivecraft/massivecore/chestgui/ChestGui.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/collections/ExceptionSet.java b/src/com/massivecraft/massivecore/collections/ExceptionSet.java index e9c1791c..3b49eb62 100644 --- a/src/com/massivecraft/massivecore/collections/ExceptionSet.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java index 8d06e9e6..d7482d19 100644 --- a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/MassiveCommand.java b/src/com/massivecraft/massivecore/command/MassiveCommand.java index 8acd4bc9..940146f6 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommand.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java b/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java index eb8edeb1..1f102fde 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/MassiveCommandSet.java b/src/com/massivecraft/massivecore/command/MassiveCommandSet.java index a183ad17..dd0ed201 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommandSet.java +++ b/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 extends MassiveCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/MassiveCommandToggle.java b/src/com/massivecraft/massivecore/command/MassiveCommandToggle.java index 82e63003..84724d06 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommandToggle.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/MassiveCommandVersion.java b/src/com/massivecraft/massivecore/command/MassiveCommandVersion.java index afd82bcd..c16a2ad0 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommandVersion.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java b/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java index f1155c50..d1189d67 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/Parameter.java b/src/com/massivecraft/massivecore/command/Parameter.java index bd447d0c..39a12bdb 100644 --- a/src/com/massivecraft/massivecore/command/Parameter.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java index f82cb107..01c19084 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java +++ b/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 extends MassiveCommand { diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java index c565505e..f4d9b4f8 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java +++ b/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 extends CommandEditAbstract { diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerInsert.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerInsert.java index b830d6f5..296022a2 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerInsert.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerMove.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerMove.java index 1e985bc8..1f3e2a23 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerMove.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemove.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemove.java index 159b8de9..6dfda08d 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemove.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemoveIndex.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemoveIndex.java index 820f2a54..b50b5fb6 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerRemoveIndex.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSet.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSet.java index bbcfbd2a..b68e6eb9 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSet.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSwap.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSwap.java index 7e339987..ecbf7cd6 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerSwap.java +++ b/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 extends CommandEditContainerAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java index 141f5293..544d62ec 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java +++ b/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 extends CommandEditAbstract> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksAbstract.java index a30ade2e..cfb5cd3f 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksAbstract.java +++ b/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 extends CommandEditAbstract> { diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java index 9c9a2f62..163ea781 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java +++ b/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 extends CommandEditItemStacksAbstract implements Listener { diff --git a/src/com/massivecraft/massivecore/command/editor/EditSettings.java b/src/com/massivecraft/massivecore/command/editor/EditSettings.java index 6f8a829d..e3b6d254 100644 --- a/src/com/massivecraft/massivecore/command/editor/EditSettings.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/editor/Property.java b/src/com/massivecraft/massivecore/command/editor/Property.java index 69dd16b8..cdd71eef 100644 --- a/src/com/massivecraft/massivecore/command/editor/Property.java +++ b/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 implements Named { diff --git a/src/com/massivecraft/massivecore/command/editor/PropertyReflection.java b/src/com/massivecraft/massivecore/command/editor/PropertyReflection.java index b0ba09f7..2ad2966e 100644 --- a/src/com/massivecraft/massivecore/command/editor/PropertyReflection.java +++ b/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 extends Property { diff --git a/src/com/massivecraft/massivecore/command/editor/PropertyThisSenderEntity.java b/src/com/massivecraft/massivecore/command/editor/PropertyThisSenderEntity.java index 19426694..6f823d40 100644 --- a/src/com/massivecraft/massivecore/command/editor/PropertyThisSenderEntity.java +++ b/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> extends Property { diff --git a/src/com/massivecraft/massivecore/command/editor/PropertyUsed.java b/src/com/massivecraft/massivecore/command/editor/PropertyUsed.java index ca403821..7dea5e4d 100644 --- a/src/com/massivecraft/massivecore/command/editor/PropertyUsed.java +++ b/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 extends Property { diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCore.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCore.java index 0f1b7c40..1ad798d4 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCore.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreBuffer.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreBuffer.java index 7aade508..215b1400 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreBuffer.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreCmdurl.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreCmdurl.java index d5b2c3f0..04f48812 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreCmdurl.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreHearsound.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreHearsound.java index 4a9bab54..ed827a06 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreHearsound.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStore.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStore.java index da7fa02e..3b3f763a 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStore.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreCopydb.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreCopydb.java index 4d75d74f..fbde0cc5 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreCopydb.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java index 53ad0316..32f4de5e 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreStats.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreStats.java index 51fea136..3313f1b2 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreStats.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreTest.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreTest.java index 84b072d8..503ac83f 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreTest.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsys.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsys.java index 8ef2ada3..78aa5457 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsys.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java index 3f97ba90..b07df423 100644 --- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/requirement/Requirement.java b/src/com/massivecraft/massivecore/command/requirement/Requirement.java index 8e07ec6e..887e0c07 100644 --- a/src/com/massivecraft/massivecore/command/requirement/Requirement.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java b/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java index f58ee2b4..05e09a95 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java b/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java index d7430d55..dfd6e117 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java +++ b/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; diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementEditorPropertyCreated.java b/src/com/massivecraft/massivecore/command/requirement/RequirementEditorPropertyCreated.java index 634cbe28..b5e56b68 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementEditorPropertyCreated.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementEditorUse.java b/src/com/massivecraft/massivecore/command/requirement/RequirementEditorUse.java index 91eda628..f0da898d 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementEditorUse.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementHasItemInHand.java b/src/com/massivecraft/massivecore/command/requirement/RequirementHasItemInHand.java index 35f44e3e..ba13083f 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementHasItemInHand.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java b/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java index c9868640..aceebe62 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementIsPlayer.java b/src/com/massivecraft/massivecore/command/requirement/RequirementIsPlayer.java index 2d29a57b..5fa18738 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementIsPlayer.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementIsntCertainSender.java b/src/com/massivecraft/massivecore/command/requirement/RequirementIsntCertainSender.java index 4208ca25..15f7b1ba 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementIsntCertainSender.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementIsntPlayer.java b/src/com/massivecraft/massivecore/command/requirement/RequirementIsntPlayer.java index 55731814..0bd972a7 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementIsntPlayer.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementTitlesAvailable.java b/src/com/massivecraft/massivecore/command/requirement/RequirementTitlesAvailable.java index b716ba33..c5a8be9a 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementTitlesAvailable.java +++ b/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 { diff --git a/src/com/massivecraft/massivecore/command/type/RegistryType.java b/src/com/massivecraft/massivecore/command/type/RegistryType.java index 92dff00c..340069fc 100644 --- a/src/com/massivecraft/massivecore/command/type/RegistryType.java +++ b/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 { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/Type.java b/src/com/massivecraft/massivecore/command/type/Type.java index f55af805..548da853 100644 --- a/src/com/massivecraft/massivecore/command/type/Type.java +++ b/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 extends Named { diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java index e60c0aa2..aaf0bdc1 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java +++ b/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 implements Type { diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java index 09bb01e4..c8924e04 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java +++ b/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 extends TypeAbstract implements AllAble { diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractException.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractException.java index 9e11810e..6c04a8c0 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstractException.java +++ b/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 extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java index c6f55f13..e4d54406 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java +++ b/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 extends TypeAbstract implements AllAble { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractSimple.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractSimple.java index 6f689028..6488cee3 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstractSimple.java +++ b/src/com/massivecraft/massivecore/command/type/TypeAbstractSimple.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.command.type; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public abstract class TypeAbstractSimple extends TypeAbstractException { diff --git a/src/com/massivecraft/massivecore/command/type/TypeColor.java b/src/com/massivecraft/massivecore/command/type/TypeColor.java index 43565c64..07b939f6 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeColor.java +++ b/src/com/massivecraft/massivecore/command/type/TypeColor.java @@ -1,17 +1,16 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - -import org.bukkit.ChatColor; -import org.bukkit.Color; -import org.bukkit.DyeColor; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.enumeration.TypeDyeColor; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; +import org.bukkit.Color; +import org.bukkit.DyeColor; +import org.bukkit.command.CommandSender; + +import java.util.Collection; public class TypeColor extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypeDataItemStack.java b/src/com/massivecraft/massivecore/command/type/TypeDataItemStack.java index a59d8e5f..af822051 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeDataItemStack.java +++ b/src/com/massivecraft/massivecore/command/type/TypeDataItemStack.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type; -import org.bukkit.command.CommandSender; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.command.type.primitive.TypeObject; import com.massivecraft.massivecore.item.DataItemStack; +import org.bukkit.command.CommandSender; +import org.bukkit.inventory.ItemStack; public class TypeDataItemStack extends TypeTransformer { diff --git a/src/com/massivecraft/massivecore/command/type/TypeDate.java b/src/com/massivecraft/massivecore/command/type/TypeDate.java index 217ee021..03cd33da 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeDate.java +++ b/src/com/massivecraft/massivecore/command/type/TypeDate.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.command.type; +import org.bukkit.command.CommandSender; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Collections; import java.util.Date; -import org.bukkit.command.CommandSender; - public class TypeDate extends TypeAbstractSimple { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/TypeDestination.java b/src/com/massivecraft/massivecore/command/type/TypeDestination.java index 42571e21..ce9cc83a 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeDestination.java +++ b/src/com/massivecraft/massivecore/command/type/TypeDestination.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.event.EventMassiveCoreDestination; import com.massivecraft.massivecore.event.EventMassiveCoreDestinationTabList; import com.massivecraft.massivecore.teleport.Destination; +import org.bukkit.command.CommandSender; + +import java.util.Collection; public class TypeDestination extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypeId.java b/src/com/massivecraft/massivecore/command/type/TypeId.java index a774948d..ee8d17be 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeId.java +++ b/src/com/massivecraft/massivecore/command/type/TypeId.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type; -import org.bukkit.Sound; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.enumeration.TypeSound; import com.massivecraft.massivecore.command.type.primitive.TypeStringId; +import org.bukkit.Sound; +import org.bukkit.command.CommandSender; public class TypeId extends TypeTransformer { diff --git a/src/com/massivecraft/massivecore/command/type/TypeItemStack.java b/src/com/massivecraft/massivecore/command/type/TypeItemStack.java index 977c872d..c27863cc 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeItemStack.java +++ b/src/com/massivecraft/massivecore/command/type/TypeItemStack.java @@ -1,17 +1,16 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - -import org.bukkit.Material; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.ExceptionSet; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.InventoryUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Material; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import java.util.Collection; public class TypeItemStack extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypeMaterialId.java b/src/com/massivecraft/massivecore/command/type/TypeMaterialId.java index 15190966..a3d86f42 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeMaterialId.java +++ b/src/com/massivecraft/massivecore/command/type/TypeMaterialId.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type; -import org.bukkit.Material; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.command.type.enumeration.TypeMaterial; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; +import org.bukkit.Material; +import org.bukkit.command.CommandSender; @SuppressWarnings("deprecation") public class TypeMaterialId extends TypeTransformer diff --git a/src/com/massivecraft/massivecore/command/type/TypeMillisDiff.java b/src/com/massivecraft/massivecore/command/type/TypeMillisDiff.java index 9f1146db..afe22d4b 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeMillisDiff.java +++ b/src/com/massivecraft/massivecore/command/type/TypeMillisDiff.java @@ -1,14 +1,13 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.util.TimeDiffUtil; import com.massivecraft.massivecore.util.TimeUnit; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; + +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; public class TypeMillisDiff extends TypeAbstractException { diff --git a/src/com/massivecraft/massivecore/command/type/TypeNameAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeNameAbstract.java index 2b1b2451..173b9bba 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeNameAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/TypeNameAbstract.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; -import java.util.Collections; - +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.Named; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.MassiveException; +import java.util.Collection; +import java.util.Collections; public abstract class TypeNameAbstract extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypeNullable.java b/src/com/massivecraft/massivecore/command/type/TypeNullable.java index 8db4019e..3f5de6d4 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeNullable.java +++ b/src/com/massivecraft/massivecore/command/type/TypeNullable.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.command.type; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.MassiveException; +import org.bukkit.command.CommandSender; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.bukkit.command.CommandSender; - -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.MassiveException; public class TypeNullable extends TypeWrapper { diff --git a/src/com/massivecraft/massivecore/command/type/TypePS.java b/src/com/massivecraft/massivecore/command/type/TypePS.java index 9975e78b..e1cdfd47 100644 --- a/src/com/massivecraft/massivecore/command/type/TypePS.java +++ b/src/com/massivecraft/massivecore/command/type/TypePS.java @@ -1,14 +1,5 @@ package com.massivecraft.massivecore.command.type; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.bukkit.Location; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Entity; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.command.type.primitive.TypeFloat; @@ -16,6 +7,14 @@ import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSBuilder; import com.massivecraft.massivecore.ps.PSFormatDesc; +import org.apache.commons.lang.StringUtils; +import org.bukkit.Location; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Entity; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; public class TypePS extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/TypePermission.java b/src/com/massivecraft/massivecore/command/type/TypePermission.java index 68ad930a..d37b3a0f 100644 --- a/src/com/massivecraft/massivecore/command/type/TypePermission.java +++ b/src/com/massivecraft/massivecore/command/type/TypePermission.java @@ -1,9 +1,10 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; import org.bukkit.Bukkit; import org.bukkit.permissions.Permission; +import java.util.Collection; + public class TypePermission extends TypeAbstractChoice { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java b/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java index 3e4ba403..f5be7055 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java +++ b/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java @@ -1,21 +1,20 @@ package com.massivecraft.massivecore.command.type; +import com.massivecraft.massivecore.MassiveException; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.engine.EngineMassiveCoreCommandRegistration; +import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.SimpleCommandMap; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.SimpleCommandMap; - -import com.massivecraft.massivecore.MassiveException; -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.engine.EngineMassiveCoreCommandRegistration; -import com.massivecraft.massivecore.util.Txt; - // We operate without the leading slash as much as possible. // We return the command without leading slash. // If the player supplies a leading slash we assume they mean some WorldEdit double slash first. diff --git a/src/com/massivecraft/massivecore/command/type/TypeTransformer.java b/src/com/massivecraft/massivecore/command/type/TypeTransformer.java index 62bce5d5..01ca0634 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeTransformer.java +++ b/src/com/massivecraft/massivecore/command/type/TypeTransformer.java @@ -1,18 +1,17 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; -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.collections.MassiveSet; 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.List; +import java.util.Set; // The INNER type controls all ways the type behaves and seems. // It is used for visuals, names, ids and when reading from a command argument. diff --git a/src/com/massivecraft/massivecore/command/type/TypeUniverse.java b/src/com/massivecraft/massivecore/command/type/TypeUniverse.java index 5b6585e5..1d085f41 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeUniverse.java +++ b/src/com/massivecraft/massivecore/command/type/TypeUniverse.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.Multiverse; +import java.util.Collection; + public class TypeUniverse extends TypeAbstractChoice { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/TypeWorld.java b/src/com/massivecraft/massivecore/command/type/TypeWorld.java index e800da11..943815ec 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeWorld.java +++ b/src/com/massivecraft/massivecore/command/type/TypeWorld.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - +import com.massivecraft.massivecore.mixin.MixinWorld; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.mixin.MixinWorld; +import java.util.Collection; public class TypeWorld extends TypeAbstractChoice { diff --git a/src/com/massivecraft/massivecore/command/type/TypeWorldId.java b/src/com/massivecraft/massivecore/command/type/TypeWorldId.java index 2a580c27..4c09be7e 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeWorldId.java +++ b/src/com/massivecraft/massivecore/command/type/TypeWorldId.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; - +import com.massivecraft.massivecore.mixin.MixinWorld; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.mixin.MixinWorld; +import java.util.Collection; public class TypeWorldId extends TypeAbstractChoice { diff --git a/src/com/massivecraft/massivecore/command/type/TypeWrapper.java b/src/com/massivecraft/massivecore/command/type/TypeWrapper.java index 87cbfc8d..eff56f1b 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeWrapper.java +++ b/src/com/massivecraft/massivecore/command/type/TypeWrapper.java @@ -1,16 +1,15 @@ package com.massivecraft.massivecore.command.type; -import java.util.Collection; -import java.util.List; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; 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.command.CommandSender; + +import java.util.Collection; +import java.util.List; public class TypeWrapper extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java index 0f493e7e..d36d0ec4 100644 --- a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java +++ b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java @@ -1,15 +1,5 @@ package com.massivecraft.massivecore.command.type.combined; -import java.util.AbstractMap.SimpleEntry; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map.Entry; -import java.util.regex.Pattern; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.editor.Property; @@ -18,6 +8,15 @@ import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.command.type.TypeAbstract; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; + +import java.util.AbstractMap.SimpleEntry; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map.Entry; +import java.util.regex.Pattern; public abstract class TypeCombined extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java b/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java index d1f5eeb9..cde2a691 100644 --- a/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java +++ b/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.command.type.combined; +import com.massivecraft.massivecore.command.type.Type; + import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; -import com.massivecraft.massivecore.command.type.Type; - public class TypeEntry extends TypeCombined> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java b/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java index e9ce3dc9..750d002d 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java @@ -1,12 +1,5 @@ package com.massivecraft.massivecore.command.type.container; -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.MassiveException; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.editor.CommandEditAbstract; @@ -18,6 +11,12 @@ import com.massivecraft.massivecore.command.type.TypeAbstract; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.ContainerUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; public abstract class TypeContainer extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java b/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java index ad5024dd..aac13ed4 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java @@ -1,14 +1,13 @@ package com.massivecraft.massivecore.command.type.container; -import java.util.List; - -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.command.editor.CommandEditAbstract; import com.massivecraft.massivecore.command.editor.CommandEditItemStacks; import com.massivecraft.massivecore.command.editor.EditSettings; import com.massivecraft.massivecore.command.editor.Property; import com.massivecraft.massivecore.command.type.TypeItemStack; +import org.bukkit.inventory.ItemStack; + +import java.util.List; public class TypeItemStacks extends TypeList { diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeList.java b/src/com/massivecraft/massivecore/command/type/container/TypeList.java index b65ea462..f2a3e91c 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeList.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeList.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.command.type.container; -import java.util.List; - import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.type.Type; +import java.util.List; + public class TypeList extends TypeContainer, E> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeMap.java b/src/com/massivecraft/massivecore/command/type/container/TypeMap.java index 98bffa59..cfd93e6a 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeMap.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeMap.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.command.type.container; -import java.util.Map; -import java.util.Map.Entry; - import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.command.type.combined.TypeEntry; +import java.util.Map; +import java.util.Map.Entry; + public class TypeMap extends TypeContainer, Entry> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java index a9da7ee5..b208af25 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.command.type.container; -import java.util.Set; - import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.type.Type; +import java.util.Set; + public class TypeSet extends TypeContainer, E> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverter.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverter.java index fe5114bb..36230475 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverter.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverter.java @@ -1,11 +1,9 @@ package com.massivecraft.massivecore.command.type.convert; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.command.type.TypeTransformer; import com.massivecraft.massivecore.item.Converter; +import org.bukkit.command.CommandSender; public class TypeConverter extends TypeTransformer { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterColor.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterColor.java index e8618a36..096bbcb2 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterColor.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterColor.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.Color; - import com.massivecraft.massivecore.command.type.TypeColor; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.item.ConverterFromColor; import com.massivecraft.massivecore.item.ConverterToColor; +import org.bukkit.Color; public class TypeConverterColor extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterDyeColor.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterDyeColor.java index a9ce213c..12d68d2d 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterDyeColor.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterDyeColor.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.DyeColor; - import com.massivecraft.massivecore.command.type.enumeration.TypeDyeColor; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.item.ConverterFromDyeColor; import com.massivecraft.massivecore.item.ConverterToDyeColor; +import org.bukkit.DyeColor; public class TypeConverterDyeColor extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterEnchant.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterEnchant.java index 7654ee4e..490f7285 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterEnchant.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterEnchant.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.enchantments.Enchantment; - import com.massivecraft.massivecore.command.type.TypeEnchantment; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.item.ConverterFromEnchant; import com.massivecraft.massivecore.item.ConverterToEnchant; +import org.bukkit.enchantments.Enchantment; public class TypeConverterEnchant extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterFireworkEffectType.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterFireworkEffectType.java index 5856368b..4dba10f3 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterFireworkEffectType.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterFireworkEffectType.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.FireworkEffect.Type; - import com.massivecraft.massivecore.command.type.enumeration.TypeFireworkEffectType; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.item.ConverterFromFireworkEffectType; import com.massivecraft.massivecore.item.ConverterToFireworkEffectType; +import org.bukkit.FireworkEffect.Type; public class TypeConverterFireworkEffectType extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterItemFlag.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterItemFlag.java index 0347eea5..2c422719 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterItemFlag.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterItemFlag.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.inventory.ItemFlag; - import com.massivecraft.massivecore.command.type.enumeration.TypeItemFlag; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.item.ConverterFromItemFlag; import com.massivecraft.massivecore.item.ConverterToItemFlag; +import org.bukkit.inventory.ItemFlag; public class TypeConverterItemFlag extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterPotionEffectType.java b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterPotionEffectType.java index c9adb2be..4080ecf0 100644 --- a/src/com/massivecraft/massivecore/command/type/convert/TypeConverterPotionEffectType.java +++ b/src/com/massivecraft/massivecore/command/type/convert/TypeConverterPotionEffectType.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.convert; -import org.bukkit.potion.PotionEffectType; - import com.massivecraft.massivecore.command.type.TypePotionEffectType; import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.item.ConverterFromPotionEffectType; import com.massivecraft.massivecore.item.ConverterToPotionEffectType; +import org.bukkit.potion.PotionEffectType; public class TypeConverterPotionEffectType extends TypeConverter { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeDyeColor.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeDyeColor.java index 259eef37..c83fbd4a 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeDyeColor.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeDyeColor.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.enumeration; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.ChatColor; import org.bukkit.DyeColor; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.util.MUtil; - public class TypeDyeColor extends TypeEnum { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java index 82b07d7a..aefba813 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.enumeration; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.entity.EntityType; -import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; public class TypeEntityType extends TypeEnum { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java index e5622a09..12840e83 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.enumeration; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.World.Environment; -import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; public class TypeEnvironment extends TypeEnum { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java index 116f60a7..18827f88 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.enumeration; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.GameMode; -import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; public class TypeGameMode extends TypeEnum { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSoundId.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSoundId.java index a8756143..3168353c 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSoundId.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSoundId.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.command.type.enumeration; -import org.bukkit.Sound; - import com.massivecraft.massivecore.command.type.TypeId; +import org.bukkit.Sound; public class TypeSoundId extends TypeId { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java index a6f20e5a..e4354732 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type.enumeration; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.ChatColor; import org.bukkit.WeatherType; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; public class TypeWeatherType extends TypeEnum { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java index ad4e1e20..90ceb036 100644 --- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.enumeration; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; import org.bukkit.WorldType; -import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; public class TypeWorldType extends TypeEnum { diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeAbstractNumber.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeAbstractNumber.java index cbe68b64..2e90cfb2 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeAbstractNumber.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeAbstractNumber.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.command.type.primitive; +import com.massivecraft.massivecore.command.type.TypeAbstractSimple; +import org.bukkit.command.CommandSender; + import java.util.Collection; import java.util.Collections; import java.util.List; -import org.bukkit.command.CommandSender; - -import com.massivecraft.massivecore.command.type.TypeAbstractSimple; - public abstract class TypeAbstractNumber extends TypeAbstractSimple { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java index 46071cc8..4eab281e 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type.primitive; -import java.util.Set; - -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.type.TypeAbstractChoice; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; + +import java.util.Set; public abstract class TypeBooleanAbstract extends TypeAbstractChoice { diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java index 6cd1b5a1..3aae578e 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type.primitive; +import com.massivecraft.massivecore.command.type.TypeAbstract; +import org.bukkit.command.CommandSender; + import java.util.Collection; import java.util.Collections; -import org.bukkit.command.CommandSender; - -import com.massivecraft.massivecore.command.type.TypeAbstract; - // This type is pretty weak and dysfunctional. // It's intended to be used as a place holder. // You can pass it instead of null for the sake of NPE evasion. diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java index 526c1627..fd872031 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.command.type.primitive; +import com.massivecraft.massivecore.command.type.TypeAbstract; +import org.bukkit.command.CommandSender; + import java.util.Collection; import java.util.Collections; -import org.bukkit.command.CommandSender; - -import com.massivecraft.massivecore.command.type.TypeAbstract; - public class TypeString extends TypeAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeStringParsed.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeStringParsed.java index c25ef5d2..f35b7260 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeStringParsed.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeStringParsed.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.command.type.primitive; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class TypeStringParsed extends TypeString { diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypePlayer.java b/src/com/massivecraft/massivecore/command/type/sender/TypePlayer.java index a590604c..01e37401 100644 --- a/src/com/massivecraft/massivecore/command/type/sender/TypePlayer.java +++ b/src/com/massivecraft/massivecore/command/type/sender/TypePlayer.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.sender; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; import com.massivecraft.massivecore.store.SenderIdSourceMixinAllSenderIds; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.entity.Player; public class TypePlayer extends TypeSenderIdAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSender.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSender.java index ed592e72..f9ce5907 100644 --- a/src/com/massivecraft/massivecore/command/type/sender/TypeSender.java +++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSender.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.command.type.sender; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; import com.massivecraft.massivecore.store.SenderIdSourceMixinAllSenderIds; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.command.CommandSender; public class TypeSender extends TypeSenderIdAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntityId.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntityId.java index ae43e9b0..00b27d76 100644 --- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntityId.java +++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntityId.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.sender; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.command.type.TypeTransformer; import com.massivecraft.massivecore.command.type.primitive.TypeStringId; import com.massivecraft.massivecore.store.SenderEntity; +import org.bukkit.command.CommandSender; public class TypeSenderEntityId> extends TypeTransformer { diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java index ec011a9b..d004a7e9 100644 --- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java @@ -1,11 +1,5 @@ package com.massivecraft.massivecore.command.type.sender; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; @@ -17,6 +11,11 @@ import com.massivecraft.massivecore.store.SenderIdSource; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; + +import java.util.Collection; +import java.util.Collections; +import java.util.Set; public abstract class TypeSenderIdAbstract extends TypeAbstract { diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java b/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java index 79935e1c..c5048048 100644 --- a/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java +++ b/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.store; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.AspectColl; import com.massivecraft.massivecore.MassiveCorePerm; +import org.bukkit.command.CommandSender; public class TypeAspect extends TypeEntity { diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeColl.java b/src/com/massivecraft/massivecore/command/type/store/TypeColl.java index b8852ce4..4449c491 100644 --- a/src/com/massivecraft/massivecore/command/type/store/TypeColl.java +++ b/src/com/massivecraft/massivecore/command/type/store/TypeColl.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.command.type.store; -import java.util.Collection; - import com.massivecraft.massivecore.command.type.TypeAbstractChoice; import com.massivecraft.massivecore.store.Coll; +import java.util.Collection; + public class TypeColl extends TypeAbstractChoice> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeEntity.java b/src/com/massivecraft/massivecore/command/type/store/TypeEntity.java index 71f7ec55..14002ce1 100644 --- a/src/com/massivecraft/massivecore/command/type/store/TypeEntity.java +++ b/src/com/massivecraft/massivecore/command/type/store/TypeEntity.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.command.type.store; -import java.util.Collection; - import com.massivecraft.massivecore.command.type.TypeAbstractChoice; import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.store.Entity; +import java.util.Collection; + public class TypeEntity> extends TypeAbstractChoice { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeEntityId.java b/src/com/massivecraft/massivecore/command/type/store/TypeEntityId.java index c5f64afd..b44ad0f2 100644 --- a/src/com/massivecraft/massivecore/command/type/store/TypeEntityId.java +++ b/src/com/massivecraft/massivecore/command/type/store/TypeEntityId.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.store; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.command.type.TypeTransformer; import com.massivecraft.massivecore.command.type.primitive.TypeStringId; import com.massivecraft.massivecore.store.Entity; +import org.bukkit.command.CommandSender; public class TypeEntityId> extends TypeTransformer { diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java b/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java index 4a43fb33..273aa0c9 100644 --- a/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java +++ b/src/com/massivecraft/massivecore/command/type/store/TypeMultiverse.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.command.type.store; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassiveCorePerm; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.MultiverseColl; +import org.bukkit.command.CommandSender; public class TypeMultiverse extends TypeEntity { diff --git a/src/com/massivecraft/massivecore/comparator/ComparatorCollection.java b/src/com/massivecraft/massivecore/comparator/ComparatorCollection.java index 406fc16b..9db5dd95 100644 --- a/src/com/massivecraft/massivecore/comparator/ComparatorCollection.java +++ b/src/com/massivecraft/massivecore/comparator/ComparatorCollection.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.comparator; +import com.massivecraft.massivecore.collections.MassiveList; + import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; -import com.massivecraft.massivecore.collections.MassiveList; - public class ComparatorCollection extends ComparatorAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreChestGui.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreChestGui.java index 3cf741c0..e1469459 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreChestGui.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreChestGui.java @@ -1,9 +1,14 @@ package com.massivecraft.massivecore.engine; -import org.bukkit.event.Event.Result; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.SoundEffect; +import com.massivecraft.massivecore.chestgui.ChestAction; +import com.massivecraft.massivecore.chestgui.ChestGui; +import com.massivecraft.massivecore.mixin.MixinMessage; +import com.massivecraft.massivecore.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.entity.HumanEntity; +import org.bukkit.event.Event.Result; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.inventory.InventoryClickEvent; @@ -11,12 +16,6 @@ import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.SoundEffect; -import com.massivecraft.massivecore.chestgui.ChestAction; -import com.massivecraft.massivecore.chestgui.ChestGui; -import com.massivecraft.massivecore.mixin.MixinMessage; -import com.massivecraft.massivecore.util.InventoryUtil; public class EngineMassiveCoreChestGui extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java index 3bb28f1f..1128d17e 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java @@ -1,21 +1,20 @@ package com.massivecraft.massivecore.engine; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.command.MassiveCommand; +import com.massivecraft.massivecore.command.MassiveCoreBukkitCommand; +import com.massivecraft.massivecore.util.ReflectionUtil; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.SimpleCommandMap; import org.bukkit.plugin.Plugin; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.command.MassiveCoreBukkitCommand; -import com.massivecraft.massivecore.util.ReflectionUtil; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; public class EngineMassiveCoreCommandRegistration extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java index 7433fe31..692a7be6 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java @@ -1,18 +1,5 @@ package com.massivecraft.massivecore.engine; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerQuitEvent; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.collections.MassiveMap; @@ -24,6 +11,19 @@ import com.massivecraft.massivecore.store.SenderColl; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent; +import org.bukkit.event.player.PlayerLoginEvent; +import org.bukkit.event.player.PlayerQuitEvent; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; public class EngineMassiveCoreDatabase extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java index 16a4676d..93c5babb 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java @@ -1,14 +1,5 @@ package com.massivecraft.massivecore.engine; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.collections.MassiveSet; @@ -27,6 +18,15 @@ import com.massivecraft.massivecore.teleport.DestinationTop; import com.massivecraft.massivecore.teleport.DestinationUtil; import com.massivecraft.massivecore.teleport.DestinationWorld; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.Arrays; +import java.util.List; +import java.util.Set; public class EngineMassiveCoreDestination extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java index 7da4a512..4037c0a0 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java @@ -1,18 +1,18 @@ package com.massivecraft.massivecore.engine; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.WeakHashMap; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.collections.MassiveMap; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.util.MUtil; + +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.WeakHashMap; public class EngineMassiveCoreGank extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java index 1312d1e3..1cce0984 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreLorePriority.java @@ -1,7 +1,10 @@ package com.massivecraft.massivecore.engine; -import java.util.Map.Entry; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.MassiveCoreMConf; +import com.massivecraft.massivecore.event.EventMassiveCoreLorePriority; +import com.massivecraft.massivecore.util.InventoryUtil; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -9,11 +12,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.inventory.ItemStack; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.MassiveCoreMConf; -import com.massivecraft.massivecore.event.EventMassiveCoreLorePriority; -import com.massivecraft.massivecore.util.InventoryUtil; -import com.massivecraft.massivecore.util.MUtil; +import java.util.Map.Entry; public class EngineMassiveCoreLorePriority extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java index 436d91d0..8a6db71f 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java @@ -1,23 +1,5 @@ package com.massivecraft.massivecore.engine; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -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.entity.EntityDamageByBlockEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerChatTabCompleteEvent; -import org.bukkit.event.player.PlayerKickEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveCoreMConf; @@ -33,6 +15,25 @@ import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.SmokeUtil; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityDamageByBlockEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerChatTabCompleteEvent; +import org.bukkit.event.player.PlayerKickEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; public class EngineMassiveCoreMain extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerLeave.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerLeave.java index 1619deb1..be84e9d7 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerLeave.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerLeave.java @@ -1,16 +1,17 @@ package com.massivecraft.massivecore.engine; -import java.util.UUID; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +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.player.PlayerKickEvent; import org.bukkit.event.player.PlayerQuitEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; -import com.massivecraft.massivecore.util.MUtil; + +import java.util.UUID; public class EngineMassiveCorePlayerLeave extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java index 3d1bd72a..ab5930fb 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.engine; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.PlayerState; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -11,10 +11,10 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.PlayerState; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; -import com.massivecraft.massivecore.util.MUtil; + +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; public class EngineMassiveCorePlayerState extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java index e1c174ca..3513fd46 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java @@ -1,9 +1,10 @@ package com.massivecraft.massivecore.engine; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn; +import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerTeleport; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerUpdate; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -12,11 +13,10 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn; -import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerTeleport; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerUpdate; -import com.massivecraft.massivecore.util.MUtil; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /** * This event triggers the EventMassiveCorePlayerUpdate on every block change. diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java index 4a7f44d7..5e5c4e50 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java @@ -1,8 +1,13 @@ package com.massivecraft.massivecore.engine; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.mixin.MixinActual; +import com.massivecraft.massivecore.mixin.MixinMessage; +import com.massivecraft.massivecore.teleport.ScheduledTeleport; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.TimeUnit; import org.bukkit.entity.Entity; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; @@ -13,14 +18,9 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.player.PlayerMoveEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; -import com.massivecraft.massivecore.mixin.MixinActual; -import com.massivecraft.massivecore.mixin.MixinMessage; -import com.massivecraft.massivecore.teleport.ScheduledTeleport; -import com.massivecraft.massivecore.util.IdUtil; -import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.util.TimeUnit; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; public class EngineMassiveCoreScheduledTeleport extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java index 4884655e..b91cdf64 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java @@ -1,16 +1,5 @@ package com.massivecraft.massivecore.engine; -import java.io.File; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerJoinEvent; - import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.MassiveCoreMSponsorInfo; @@ -20,6 +9,16 @@ import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerJoinEvent; + +import java.io.File; +import java.util.List; public class EngineMassiveCoreSponsor extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreTeleportMixinCause.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreTeleportMixinCause.java index 1c7e125f..dfadf86d 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreTeleportMixinCause.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreTeleportMixinCause.java @@ -1,15 +1,15 @@ package com.massivecraft.massivecore.engine; -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.MassiveCore; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerTeleportEvent; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.MassiveCore; + +import java.util.Collections; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; public class EngineMassiveCoreTeleportMixinCause extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java index 53876786..09a396d9 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java @@ -1,9 +1,12 @@ package com.massivecraft.massivecore.engine; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.MassiveCoreMConf; +import com.massivecraft.massivecore.MassiveCorePerm; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.InventoryUtil; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.Txt; import org.apache.commons.lang.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.entity.HumanEntity; @@ -15,13 +18,10 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.MassiveCoreMConf; -import com.massivecraft.massivecore.MassiveCorePerm; -import com.massivecraft.massivecore.util.IdUtil; -import com.massivecraft.massivecore.util.InventoryUtil; -import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.util.Txt; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class EngineMassiveCoreVariable extends Engine { diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java index 7b1926c8..9aa99baf 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java @@ -1,16 +1,16 @@ package com.massivecraft.massivecore.engine; -import java.util.Collections; -import java.util.Set; -import java.util.TreeSet; - +import com.massivecraft.massivecore.Engine; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; -import com.massivecraft.massivecore.Engine; + +import java.util.Collections; +import java.util.Set; +import java.util.TreeSet; public class EngineMassiveCoreWorldNameSet extends Engine { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCore.java b/src/com/massivecraft/massivecore/event/EventMassiveCore.java index c9013c81..4a509d0b 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCore.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCore.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.event; -import java.util.Map; - +import com.massivecraft.massivecore.collections.MassiveMap; import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; -import com.massivecraft.massivecore.collections.MassiveMap; +import java.util.Map; public abstract class EventMassiveCore extends Event implements Runnable, Cancellable { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestination.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestination.java index 9be02117..e429c7ba 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestination.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestination.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.teleport.Destination; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventMassiveCoreDestination extends EventMassiveCore { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java index 738f2711..120030fa 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.event; -import java.util.List; - +import com.massivecraft.massivecore.collections.MassiveList; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.massivecore.collections.MassiveList; +import java.util.List; public class EventMassiveCoreDestinationTabList extends EventMassiveCore { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreEditorEdit.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreEditorEdit.java index be33d911..10c99f95 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreEditorEdit.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreEditorEdit.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.event; -import org.bukkit.event.HandlerList; - import com.massivecraft.massivecore.command.editor.CommandEditAbstract; +import org.bukkit.event.HandlerList; public class EventMassiveCoreEditorEdit extends EventMassiveCore { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java index 978a6a67..1ff7c2da 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java @@ -1,19 +1,18 @@ package com.massivecraft.massivecore.event; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.predicate.Predicate; +import org.bukkit.ChatColor; +import org.bukkit.event.HandlerList; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + import java.util.AbstractMap.SimpleEntry; import java.util.Collections; import java.util.List; import java.util.Map.Entry; import java.util.regex.Pattern; -import org.bukkit.ChatColor; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.predicate.Predicate; - public class EventMassiveCoreLorePriority extends EventMassiveCore { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java index 69ecc6ed..7e70a5a0 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java @@ -1,15 +1,14 @@ package com.massivecraft.massivecore.event; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import com.massivecraft.massivecore.util.MUtil; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /** * The EventMassiveCorePlayerLeave is a non-cancellable event. diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java index 6f0e0bc5..e5f70713 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerPSTeleport.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.event; -import org.bukkit.event.HandlerList; - import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.teleport.Destination; +import org.bukkit.event.HandlerList; public class EventMassiveCorePlayerPSTeleport extends EventMassiveCore { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java index d943e4b9..2cabcef3 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.event; -import java.util.Set; - +import com.massivecraft.massivecore.collections.MassiveSet; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import com.massivecraft.massivecore.collections.MassiveSet; -import com.massivecraft.massivecore.util.MUtil; +import java.util.Set; /** * The purpose of this event is to allow multiple plugins to have a say about these player properties. diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java index 2be28759..3e997ce6 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegister.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.event; +import com.massivecraft.massivecore.util.IdData; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.massivecore.util.IdData; - public class EventMassiveCoreSenderRegister extends EventMassiveCoreSenderRegistry { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java index 8fd3e52a..1f83fb24 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderRegistry.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.event; -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.util.IdData; +import org.bukkit.command.CommandSender; public abstract class EventMassiveCoreSenderRegistry extends EventMassiveCore { diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java index 89475e70..1332bd34 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreSenderUnregister.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.event; +import com.massivecraft.massivecore.util.IdData; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.massivecore.util.IdData; - public class EventMassiveCoreSenderUnregister extends EventMassiveCoreSenderRegistry { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/fetcher/Fetcher.java b/src/com/massivecraft/massivecore/fetcher/Fetcher.java index 7ed04437..067c4c1c 100644 --- a/src/com/massivecraft/massivecore/fetcher/Fetcher.java +++ b/src/com/massivecraft/massivecore/fetcher/Fetcher.java @@ -1,5 +1,7 @@ package com.massivecraft.massivecore.fetcher; +import com.massivecraft.massivecore.util.MUtil; + import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -12,8 +14,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import com.massivecraft.massivecore.util.MUtil; - public class Fetcher implements Callable> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java index 1653d3e2..0bc684a1 100644 --- a/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java @@ -1,5 +1,8 @@ package com.massivecraft.massivecore.fetcher; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; + import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; @@ -10,9 +13,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.Callable; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; - /** * Many thanks to evilmidget38! * This utility class is based on his work. diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java index 5932fdfe..d7070b81 100644 --- a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java +++ b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.fetcher; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; @@ -15,10 +19,6 @@ import java.util.TreeMap; import java.util.UUID; import java.util.concurrent.Callable; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; - /** * Many thanks to evilmidget38! * This utility class is based on his work. diff --git a/src/com/massivecraft/massivecore/item/ConverterFromInventoryContents.java b/src/com/massivecraft/massivecore/item/ConverterFromInventoryContents.java index 0f79fc6f..4377d65d 100644 --- a/src/com/massivecraft/massivecore/item/ConverterFromInventoryContents.java +++ b/src/com/massivecraft/massivecore/item/ConverterFromInventoryContents.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.item; -import java.util.Map; - import org.bukkit.inventory.ItemStack; +import java.util.Map; + public class ConverterFromInventoryContents extends Converter> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/ConverterList.java b/src/com/massivecraft/massivecore/item/ConverterList.java index 7b63fa82..a3b2a841 100644 --- a/src/com/massivecraft/massivecore/item/ConverterList.java +++ b/src/com/massivecraft/massivecore/item/ConverterList.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import com.massivecraft.massivecore.collections.MassiveList; +import java.util.List; + public class ConverterList extends Converter, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/ConverterMap.java b/src/com/massivecraft/massivecore/item/ConverterMap.java index c74e6f10..e5e07524 100644 --- a/src/com/massivecraft/massivecore/item/ConverterMap.java +++ b/src/com/massivecraft/massivecore/item/ConverterMap.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.item; +import com.massivecraft.massivecore.collections.MassiveMap; + import java.util.Map; import java.util.Map.Entry; -import com.massivecraft.massivecore.collections.MassiveMap; - public class ConverterMap extends Converter, Map> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/ConverterSet.java b/src/com/massivecraft/massivecore/item/ConverterSet.java index 1033663b..a3a1956d 100644 --- a/src/com/massivecraft/massivecore/item/ConverterSet.java +++ b/src/com/massivecraft/massivecore/item/ConverterSet.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.item; -import java.util.Set; - import com.massivecraft.massivecore.collections.MassiveSet; +import java.util.Set; + public class ConverterSet extends Converter, Set> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/ConverterToInventoryContents.java b/src/com/massivecraft/massivecore/item/ConverterToInventoryContents.java index 1d9fd9e1..4fe1965d 100644 --- a/src/com/massivecraft/massivecore/item/ConverterToInventoryContents.java +++ b/src/com/massivecraft/massivecore/item/ConverterToInventoryContents.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.item; -import java.util.Map; - import org.bukkit.inventory.ItemStack; +import java.util.Map; + public class ConverterToInventoryContents extends Converter, ItemStack[]> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/DataBannerPattern.java b/src/com/massivecraft/massivecore/item/DataBannerPattern.java index e1dc73ef..641b2c64 100644 --- a/src/com/massivecraft/massivecore/item/DataBannerPattern.java +++ b/src/com/massivecraft/massivecore/item/DataBannerPattern.java @@ -1,18 +1,17 @@ package com.massivecraft.massivecore.item; -import static com.massivecraft.massivecore.item.DataItemStack.get; -import static com.massivecraft.massivecore.item.DataItemStack.set; - -import java.util.Objects; - -import org.bukkit.block.banner.Pattern; - import com.massivecraft.massivecore.command.editor.annotation.EditorMethods; import com.massivecraft.massivecore.command.editor.annotation.EditorType; import com.massivecraft.massivecore.command.type.convert.TypeConverterBannerPatternType; import com.massivecraft.massivecore.command.type.convert.TypeConverterDyeColor; import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.block.banner.Pattern; + +import java.util.Objects; + +import static com.massivecraft.massivecore.item.DataItemStack.get; +import static com.massivecraft.massivecore.item.DataItemStack.set; @EditorMethods(true) public class DataBannerPattern implements Comparable diff --git a/src/com/massivecraft/massivecore/item/DataFireworkEffect.java b/src/com/massivecraft/massivecore/item/DataFireworkEffect.java index 93ee0330..21ab65f6 100644 --- a/src/com/massivecraft/massivecore/item/DataFireworkEffect.java +++ b/src/com/massivecraft/massivecore/item/DataFireworkEffect.java @@ -1,14 +1,5 @@ package com.massivecraft.massivecore.item; -import static com.massivecraft.massivecore.item.DataItemStack.get; -import static com.massivecraft.massivecore.item.DataItemStack.set; - -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -import org.bukkit.FireworkEffect; - import com.massivecraft.massivecore.collections.MassiveListDef; import com.massivecraft.massivecore.command.editor.annotation.EditorMethods; import com.massivecraft.massivecore.command.editor.annotation.EditorType; @@ -18,6 +9,14 @@ import com.massivecraft.massivecore.command.type.convert.TypeConverterFireworkEf import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import org.bukkit.FireworkEffect; + +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +import static com.massivecraft.massivecore.item.DataItemStack.get; +import static com.massivecraft.massivecore.item.DataItemStack.set; @EditorMethods(true) public class DataFireworkEffect implements Comparable diff --git a/src/com/massivecraft/massivecore/item/DataItemStack.java b/src/com/massivecraft/massivecore/item/DataItemStack.java index 3ea7d6f4..97a06e7f 100644 --- a/src/com/massivecraft/massivecore/item/DataItemStack.java +++ b/src/com/massivecraft/massivecore/item/DataItemStack.java @@ -1,16 +1,5 @@ package com.massivecraft.massivecore.item; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; - -import org.bukkit.Bukkit; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveListDef; import com.massivecraft.massivecore.collections.MassiveMap; @@ -31,6 +20,16 @@ import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.InventoryUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import org.bukkit.Bukkit; +import org.bukkit.inventory.ItemStack; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; /** * This class makes use of primitives, collections and maps only. diff --git a/src/com/massivecraft/massivecore/item/DataPotionEffect.java b/src/com/massivecraft/massivecore/item/DataPotionEffect.java index d07faf41..ded9cb0a 100644 --- a/src/com/massivecraft/massivecore/item/DataPotionEffect.java +++ b/src/com/massivecraft/massivecore/item/DataPotionEffect.java @@ -1,18 +1,17 @@ package com.massivecraft.massivecore.item; -import static com.massivecraft.massivecore.item.DataItemStack.get; -import static com.massivecraft.massivecore.item.DataItemStack.set; - -import java.util.Objects; - -import org.bukkit.potion.PotionEffect; - import com.massivecraft.massivecore.command.editor.annotation.EditorMethods; import com.massivecraft.massivecore.command.editor.annotation.EditorType; import com.massivecraft.massivecore.command.type.convert.TypeConverterColor; import com.massivecraft.massivecore.command.type.convert.TypeConverterPotionEffectType; import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.potion.PotionEffect; + +import java.util.Objects; + +import static com.massivecraft.massivecore.item.DataItemStack.get; +import static com.massivecraft.massivecore.item.DataItemStack.set; @EditorMethods(true) public class DataPotionEffect implements Comparable diff --git a/src/com/massivecraft/massivecore/item/PotionUtil.java b/src/com/massivecraft/massivecore/item/PotionUtil.java index fae5dd7e..4f788c71 100644 --- a/src/com/massivecraft/massivecore/item/PotionUtil.java +++ b/src/com/massivecraft/massivecore/item/PotionUtil.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.item; -import org.bukkit.potion.Potion; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionType; - import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; +import org.bukkit.potion.Potion; +import org.bukkit.potion.PotionData; +import org.bukkit.potion.PotionType; @SuppressWarnings("deprecation") public class PotionUtil diff --git a/src/com/massivecraft/massivecore/item/WriterAbstract.java b/src/com/massivecraft/massivecore/item/WriterAbstract.java index b7d1a692..103f7b5e 100644 --- a/src/com/massivecraft/massivecore/item/WriterAbstract.java +++ b/src/com/massivecraft/massivecore/item/WriterAbstract.java @@ -1,8 +1,5 @@ package com.massivecraft.massivecore.item; -import java.util.Arrays; -import java.util.List; - import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.collections.MassiveList; @@ -11,6 +8,9 @@ import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.ReflectionUtil; import com.massivecraft.massivecore.util.Txt; +import java.util.Arrays; +import java.util.List; + // A = What we are writing from. // B = What we are writing to. // diff --git a/src/com/massivecraft/massivecore/item/WriterAbstractItemStack.java b/src/com/massivecraft/massivecore/item/WriterAbstractItemStack.java index e4bd95ff..c5e7267b 100644 --- a/src/com/massivecraft/massivecore/item/WriterAbstractItemStack.java +++ b/src/com/massivecraft/massivecore/item/WriterAbstractItemStack.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.item; +import com.massivecraft.massivecore.nms.NmsItemStackCreate; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import com.massivecraft.massivecore.nms.NmsItemStackCreate; - public abstract class WriterAbstractItemStack extends WriterAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterAbstractReflect.java b/src/com/massivecraft/massivecore/item/WriterAbstractReflect.java index c76f1300..d13b47f3 100644 --- a/src/com/massivecraft/massivecore/item/WriterAbstractReflect.java +++ b/src/com/massivecraft/massivecore/item/WriterAbstractReflect.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.item; -import java.lang.reflect.Field; - import com.massivecraft.massivecore.util.ReflectionUtil; +import java.lang.reflect.Field; + public abstract class WriterAbstractReflect extends WriterAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java index 877479d0..bc6dbd79 100644 --- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java +++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.item; -import java.util.List; - +import com.google.common.collect.ImmutableList; import org.bukkit.Color; import org.bukkit.FireworkEffect; -import com.google.common.collect.ImmutableList; +import java.util.List; public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect, ImmutableList> { diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java index 252f7c82..cd33a7b9 100644 --- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java +++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.item; -import java.util.List; - +import com.google.common.collect.ImmutableList; import org.bukkit.Color; import org.bukkit.FireworkEffect; -import com.google.common.collect.ImmutableList; +import java.util.List; public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect, ImmutableList> { diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaBannerPatterns.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaBannerPatterns.java index aa6ccdf1..803fb49f 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaBannerPatterns.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaBannerPatterns.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.Material; import org.bukkit.block.banner.Pattern; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BannerMeta; +import java.util.List; + public class WriterItemStackMetaBannerPatterns extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaEnchants.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaEnchants.java index ed594dc9..f1260dcf 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaEnchants.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaEnchants.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.item; -import java.util.Map; -import java.util.Map.Entry; - import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import java.util.Map; +import java.util.Map.Entry; + public class WriterItemStackMetaEnchants extends WriterAbstractItemStackMetaField, Map> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaFireworkEffects.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaFireworkEffects.java index e2e2ea04..94229a2c 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaFireworkEffects.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaFireworkEffects.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.FireworkMeta; +import java.util.List; + public class WriterItemStackMetaFireworkEffects extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaFlags.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaFlags.java index d67924af..cdd19e19 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaFlags.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaFlags.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.item; -import java.util.Set; - import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import java.util.Set; + public class WriterItemStackMetaFlags extends WriterAbstractItemStackMetaField, Set> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaInventory.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaInventory.java index 827c073a..f8401e1b 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaInventory.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaInventory.java @@ -1,7 +1,6 @@ package com.massivecraft.massivecore.item; -import java.util.Map; - +import com.massivecraft.massivecore.util.InventoryUtil; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.inventory.Inventory; @@ -9,7 +8,7 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BlockStateMeta; -import com.massivecraft.massivecore.util.InventoryUtil; +import java.util.Map; // NOTE: We take ItemStack[] (inventory contents) instead of Inventories to accommodate the different sizes of inventories better. // It is not possible to create an inventory with less then 9 slots, but hoppers or brewing stands only have 5. diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaLore.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaLore.java index e4d24ae4..49460ed9 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaLore.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaLore.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import java.util.List; + public class WriterItemStackMetaLore extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaPages.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaPages.java index 449c9e1f..c5673068 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaPages.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaPages.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; +import java.util.List; + public class WriterItemStackMetaPages extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaPotionEffects.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaPotionEffects.java index 010a3714..73abed9b 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaPotionEffects.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaPotionEffects.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; +import java.util.List; + public class WriterItemStackMetaPotionEffects extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaShieldPatterns.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaShieldPatterns.java index 537180bc..738563bf 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaShieldPatterns.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaShieldPatterns.java @@ -1,7 +1,5 @@ package com.massivecraft.massivecore.item; -import java.util.List; - import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Banner; @@ -9,6 +7,8 @@ import org.bukkit.block.banner.Pattern; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BlockStateMeta; +import java.util.List; + public class WriterItemStackMetaShieldPatterns extends WriterAbstractItemStackMetaField, List> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaSkull.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaSkull.java index 9bd990e5..48491250 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaSkull.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaSkull.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.item; -import java.util.UUID; - +import com.massivecraft.massivecore.Couple; +import com.massivecraft.massivecore.nms.NmsSkullMeta; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -import com.massivecraft.massivecore.Couple; -import com.massivecraft.massivecore.nms.NmsSkullMeta; +import java.util.UUID; public class WriterItemStackMetaSkull extends WriterAbstractItemStackMetaField { diff --git a/src/com/massivecraft/massivecore/item/WriterItemStackMetaStoredEnchants.java b/src/com/massivecraft/massivecore/item/WriterItemStackMetaStoredEnchants.java index 2ca21662..ac55fc86 100644 --- a/src/com/massivecraft/massivecore/item/WriterItemStackMetaStoredEnchants.java +++ b/src/com/massivecraft/massivecore/item/WriterItemStackMetaStoredEnchants.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.item; -import java.util.Map; -import java.util.Map.Entry; - import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; +import java.util.Map; +import java.util.Map.Entry; + public class WriterItemStackMetaStoredEnchants extends WriterAbstractItemStackMetaField, Map> { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mixin/MixinActionbar.java b/src/com/massivecraft/massivecore/mixin/MixinActionbar.java index b52e0457..d264be67 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinActionbar.java +++ b/src/com/massivecraft/massivecore/mixin/MixinActionbar.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.nms.NmsChat; +import org.bukkit.entity.Player; public class MixinActionbar extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinActual.java b/src/com/massivecraft/massivecore/mixin/MixinActual.java index 1e9af9e7..66fed63b 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinActual.java +++ b/src/com/massivecraft/massivecore/mixin/MixinActual.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.event.player.PlayerJoinEvent; - import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import org.bukkit.event.player.PlayerJoinEvent; public class MixinActual extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinCommand.java b/src/com/massivecraft/massivecore/mixin/MixinCommand.java index 5d8bd76d..642f5b23 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinCommand.java +++ b/src/com/massivecraft/massivecore/mixin/MixinCommand.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.mixin; +import com.massivecraft.massivecore.util.IdUtil; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.util.IdUtil; public class MixinCommand extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinDisplayName.java b/src/com/massivecraft/massivecore/mixin/MixinDisplayName.java index 72a05969..1cc9097f 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinDisplayName.java +++ b/src/com/massivecraft/massivecore/mixin/MixinDisplayName.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; public class MixinDisplayName extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinEvent.java b/src/com/massivecraft/massivecore/mixin/MixinEvent.java index 4cf73cac..d2a33b70 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinEvent.java +++ b/src/com/massivecraft/massivecore/mixin/MixinEvent.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.mixin; -import java.io.Serializable; - import org.bukkit.Bukkit; import org.bukkit.event.Event; +import java.io.Serializable; + public class MixinEvent extends Mixin { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mixin/MixinGamemode.java b/src/com/massivecraft/massivecore/mixin/MixinGamemode.java index 8a20a54f..bcf10409 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinGamemode.java +++ b/src/com/massivecraft/massivecore/mixin/MixinGamemode.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.mixin; +import com.massivecraft.massivecore.util.IdUtil; import org.bukkit.GameMode; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.util.IdUtil; - public class MixinGamemode extends Mixin { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mixin/MixinInventory.java b/src/com/massivecraft/massivecore/mixin/MixinInventory.java index f3e0e282..56ad7130 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinInventory.java +++ b/src/com/massivecraft/massivecore/mixin/MixinInventory.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.mixin; +import com.massivecraft.massivecore.nms.NmsPlayerInventoryCreate; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.PlayerInventory; -import com.massivecraft.massivecore.nms.NmsPlayerInventoryCreate; - public class MixinInventory extends Mixin { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mixin/MixinKick.java b/src/com/massivecraft/massivecore/mixin/MixinKick.java index da0d4576..1a783309 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinKick.java +++ b/src/com/massivecraft/massivecore/mixin/MixinKick.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.entity.Player; public class MixinKick extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinLog.java b/src/com/massivecraft/massivecore/mixin/MixinLog.java index a893416e..ca3b1215 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinLog.java +++ b/src/com/massivecraft/massivecore/mixin/MixinLog.java @@ -1,8 +1,6 @@ package com.massivecraft.massivecore.mixin; import com.massivecraft.massivecore.Log; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; -import org.bukkit.event.player.PlayerJoinEvent; public class MixinLog extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinMessage.java b/src/com/massivecraft/massivecore/mixin/MixinMessage.java index 87d83fa6..5bc564c6 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinMessage.java +++ b/src/com/massivecraft/massivecore/mixin/MixinMessage.java @@ -1,16 +1,15 @@ package com.massivecraft.massivecore.mixin; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.nms.NmsChat; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; public class MixinMessage extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinPlayed.java b/src/com/massivecraft/massivecore/mixin/MixinPlayed.java index 25eabe5d..dd8da146 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinPlayed.java +++ b/src/com/massivecraft/massivecore/mixin/MixinPlayed.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.mixin; -import java.util.UUID; - +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.util.IdUtil; -import com.massivecraft.massivecore.util.MUtil; +import java.util.UUID; public class MixinPlayed extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinSenderPs.java b/src/com/massivecraft/massivecore/mixin/MixinSenderPs.java index 84afabfd..117e6449 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinSenderPs.java +++ b/src/com/massivecraft/massivecore/mixin/MixinSenderPs.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.entity.Player; public class MixinSenderPs extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinTeleport.java b/src/com/massivecraft/massivecore/mixin/MixinTeleport.java index 5a3e8604..69e8ba28 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinTeleport.java +++ b/src/com/massivecraft/massivecore/mixin/MixinTeleport.java @@ -1,12 +1,5 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.permissions.Permissible; -import org.bukkit.util.Vector; - import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.engine.EngineMassiveCoreTeleportMixinCause; import com.massivecraft.massivecore.event.EventMassiveCorePlayerPSTeleport; @@ -15,6 +8,12 @@ import com.massivecraft.massivecore.teleport.Destination; import com.massivecraft.massivecore.teleport.ScheduledTeleport; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.permissions.Permissible; +import org.bukkit.util.Vector; public class MixinTeleport extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinTitle.java b/src/com/massivecraft/massivecore/mixin/MixinTitle.java index 4d4a7eda..b886af1b 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinTitle.java +++ b/src/com/massivecraft/massivecore/mixin/MixinTitle.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.nms.NmsChat; +import org.bukkit.entity.Player; public class MixinTitle extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinVisibility.java b/src/com/massivecraft/massivecore/mixin/MixinVisibility.java index 17748c68..4649272c 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinVisibility.java +++ b/src/com/massivecraft/massivecore/mixin/MixinVisibility.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.mixin; -import org.bukkit.entity.Player; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.entity.Player; public class MixinVisibility extends Mixin { diff --git a/src/com/massivecraft/massivecore/mixin/MixinWorld.java b/src/com/massivecraft/massivecore/mixin/MixinWorld.java index f928031c..aff76a30 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinWorld.java +++ b/src/com/massivecraft/massivecore/mixin/MixinWorld.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.mixin; -import java.util.ArrayList; -import java.util.List; - +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.ps.PSFormatDesc; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -10,9 +10,8 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; -import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.ps.PSFormatDesc; -import com.massivecraft.massivecore.util.MUtil; +import java.util.ArrayList; +import java.util.List; public class MixinWorld extends Mixin { diff --git a/src/com/massivecraft/massivecore/money/Money.java b/src/com/massivecraft/massivecore/money/Money.java index cd196c74..b2a4a7d1 100644 --- a/src/com/massivecraft/massivecore/money/Money.java +++ b/src/com/massivecraft/massivecore/money/Money.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.money; -import java.util.Collection; - import com.massivecraft.massivecore.util.MUtil; +import java.util.Collection; + public class Money { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java index e53bbfb3..31c0a4dd 100644 --- a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java @@ -1,13 +1,11 @@ package com.massivecraft.massivecore.money; -import java.util.Collection; - +import com.massivecraft.massivecore.util.MUtil; +import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; -import com.massivecraft.massivecore.util.MUtil; - -import net.milkbowl.vault.economy.Economy; +import java.util.Collection; @SuppressWarnings("deprecation") public class MoneyMixinVault extends MoneyMixinAbstract diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java index f8b4d96c..750cdea9 100644 --- a/src/com/massivecraft/massivecore/mson/Mson.java +++ b/src/com/massivecraft/massivecore/mson/Mson.java @@ -1,20 +1,5 @@ package com.massivecraft.massivecore.mson; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.ListIterator; -import java.util.Objects; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang.mutable.MutableInt; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.inventory.ItemStack; - import com.google.common.collect.ImmutableList; import com.massivecraft.massivecore.adapter.AdapterLowercaseEnum; import com.massivecraft.massivecore.adapter.AdapterMsonEventFix; @@ -29,6 +14,20 @@ import com.massivecraft.massivecore.xlib.gson.GsonBuilder; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonNull; import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import org.apache.commons.lang.mutable.MutableInt; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.inventory.ItemStack; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.ListIterator; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class Mson implements Serializable { diff --git a/src/com/massivecraft/massivecore/mson/MsonEvent.java b/src/com/massivecraft/massivecore/mson/MsonEvent.java index 754059e4..41c5851b 100644 --- a/src/com/massivecraft/massivecore/mson/MsonEvent.java +++ b/src/com/massivecraft/massivecore/mson/MsonEvent.java @@ -1,19 +1,18 @@ package com.massivecraft.massivecore.mson; -import java.io.Serializable; -import java.util.Collection; -import java.util.Objects; - -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.nms.NmsItemStackTooltip; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.JsonElement; +import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; +import java.io.Serializable; +import java.util.Collection; +import java.util.Objects; + public final class MsonEvent implements Serializable { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mson/Test.java b/src/com/massivecraft/massivecore/mson/Test.java index ec49f4da..0b0d0daa 100644 --- a/src/com/massivecraft/massivecore/mson/Test.java +++ b/src/com/massivecraft/massivecore/mson/Test.java @@ -1,16 +1,16 @@ package com.massivecraft.massivecore.mson; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.util.Txt; + +import java.util.List; + import static com.massivecraft.massivecore.mson.Mson.mson; import static org.bukkit.ChatColor.BLUE; import static org.bukkit.ChatColor.GREEN; import static org.bukkit.ChatColor.RED; import static org.bukkit.ChatColor.YELLOW; -import java.util.List; - -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.util.Txt; - public class Test { public static void main(String[] args) diff --git a/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityObjective.java b/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityObjective.java index f194af11..869690a3 100644 --- a/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityObjective.java +++ b/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityObjective.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.scoreboard.Objective; - import com.massivecraft.massivecore.comparator.ComparatorAbstractTransformer; import com.massivecraft.massivecore.comparator.ComparatorIdentity; +import org.bukkit.scoreboard.Objective; public class ComparatorHandleIdentityObjective extends ComparatorAbstractTransformer { diff --git a/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityTeam.java b/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityTeam.java index de99ccf6..e3fbc1cb 100644 --- a/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityTeam.java +++ b/src/com/massivecraft/massivecore/nms/ComparatorHandleIdentityTeam.java @@ -1,9 +1,8 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.scoreboard.Team; - import com.massivecraft.massivecore.comparator.ComparatorAbstractTransformer; import com.massivecraft.massivecore.comparator.ComparatorIdentity; +import org.bukkit.scoreboard.Team; public class ComparatorHandleIdentityTeam extends ComparatorAbstractTransformer { diff --git a/src/com/massivecraft/massivecore/nms/NmsBoard.java b/src/com/massivecraft/massivecore/nms/NmsBoard.java index 94e509b7..f36bd4aa 100644 --- a/src/com/massivecraft/massivecore/nms/NmsBoard.java +++ b/src/com/massivecraft/massivecore/nms/NmsBoard.java @@ -1,14 +1,13 @@ package com.massivecraft.massivecore.nms; -import java.util.Set; - -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.Scoreboard; -import org.bukkit.scoreboard.Team; - import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.collections.MassiveTreeSet; import com.massivecraft.massivecore.mixin.Mixin; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; + +import java.util.Set; public class NmsBoard extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java index 53c9b779..00c0a722 100644 --- a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java +++ b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java @@ -1,15 +1,14 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.Set; - -import org.bukkit.scoreboard.Scoreboard; -import org.bukkit.scoreboard.Team; - import com.google.common.collect.ImmutableSet; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.Set; public class NmsBoard17R4 extends NmsBoard { diff --git a/src/com/massivecraft/massivecore/nms/NmsBoard19R1P.java b/src/com/massivecraft/massivecore/nms/NmsBoard19R1P.java index bc5f20dd..75744043 100644 --- a/src/com/massivecraft/massivecore/nms/NmsBoard19R1P.java +++ b/src/com/massivecraft/massivecore/nms/NmsBoard19R1P.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.nms; -import java.util.Set; - import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; import org.bukkit.scoreboard.Team.Option; import org.bukkit.scoreboard.Team.OptionStatus; +import java.util.Set; + public class NmsBoard19R1P extends NmsBoard { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/nms/NmsChat.java b/src/com/massivecraft/massivecore/nms/NmsChat.java index 5bcfbed4..247ed327 100644 --- a/src/com/massivecraft/massivecore/nms/NmsChat.java +++ b/src/com/massivecraft/massivecore/nms/NmsChat.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.command.CommandSender; -import org.json.simple.JSONObject; - import com.massivecraft.massivecore.mixin.Mixin; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; +import org.json.simple.JSONObject; public class NmsChat extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java b/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java index 216eff36..fb3b3d7f 100644 --- a/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java +++ b/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java @@ -1,15 +1,15 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - -import org.bukkit.command.CommandSender; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Player; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; public abstract class NmsChatAbstract extends NmsChat { diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent.java b/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent.java index 4319a4f8..5023c782 100644 --- a/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent.java +++ b/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.nms; -import java.util.Map; - -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; - import com.google.common.base.Function; import com.massivecraft.massivecore.mixin.Mixin; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; + +import java.util.Map; public class NmsEntityDamageEvent extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent17R4P.java b/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent17R4P.java index c0f49484..79e4ad9a 100644 --- a/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent17R4P.java +++ b/src/com/massivecraft/massivecore/nms/NmsEntityDamageEvent17R4P.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.nms; +import com.google.common.base.Function; +import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; + import java.lang.reflect.Field; import java.util.Map; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import com.google.common.base.Function; -import com.massivecraft.massivecore.util.ReflectionUtil; - public class NmsEntityDamageEvent17R4P extends NmsEntityDamageEvent { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityGet.java b/src/com/massivecraft/massivecore/nms/NmsEntityGet.java index a2b9e43d..dbd4eed9 100644 --- a/src/com/massivecraft/massivecore/nms/NmsEntityGet.java +++ b/src/com/massivecraft/massivecore/nms/NmsEntityGet.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.nms; -import java.util.UUID; - +import com.massivecraft.massivecore.mixin.Mixin; import org.bukkit.World; import org.bukkit.entity.Entity; -import com.massivecraft.massivecore.mixin.Mixin; + +import java.util.UUID; public class NmsEntityGet extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java b/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java index 929de7f2..7612ad0c 100644 --- a/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java +++ b/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java @@ -1,17 +1,16 @@ package com.massivecraft.massivecore.nms; +import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; +import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.entity.Entity; + import java.lang.reflect.Field; import java.util.Map; import java.util.UUID; import java.util.WeakHashMap; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.entity.Entity; - -import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; -import com.massivecraft.massivecore.util.ReflectionUtil; - public class NmsEntityGet18R1P extends NmsEntityGet { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityGetFallback.java b/src/com/massivecraft/massivecore/nms/NmsEntityGetFallback.java index fd9052c2..cbc717ab 100644 --- a/src/com/massivecraft/massivecore/nms/NmsEntityGetFallback.java +++ b/src/com/massivecraft/massivecore/nms/NmsEntityGetFallback.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.nms; -import java.util.UUID; - import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Entity; +import java.util.UUID; + public class NmsEntityGetFallback extends NmsEntityGet { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/nms/NmsItemStackCreate.java b/src/com/massivecraft/massivecore/nms/NmsItemStackCreate.java index 4070c620..3d665862 100644 --- a/src/com/massivecraft/massivecore/nms/NmsItemStackCreate.java +++ b/src/com/massivecraft/massivecore/nms/NmsItemStackCreate.java @@ -1,7 +1,7 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.inventory.ItemStack; import com.massivecraft.massivecore.mixin.Mixin; +import org.bukkit.inventory.ItemStack; public class NmsItemStackCreate extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsItemStackCreate17R4P.java b/src/com/massivecraft/massivecore/nms/NmsItemStackCreate17R4P.java index 807a34c0..7a0b0641 100644 --- a/src/com/massivecraft/massivecore/nms/NmsItemStackCreate17R4P.java +++ b/src/com/massivecraft/massivecore/nms/NmsItemStackCreate17R4P.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Constructor; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.inventory.ItemStack; + +import java.lang.reflect.Constructor; public class NmsItemStackCreate17R4P extends NmsItemStackCreate { diff --git a/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip.java b/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip.java index 7c9a2802..1d6aa195 100644 --- a/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip.java +++ b/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.mixin.Mixin; +import org.bukkit.inventory.ItemStack; public class NmsItemStackTooltip extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip18R1P.java b/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip18R1P.java index a690df7a..8f148c5d 100644 --- a/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip18R1P.java +++ b/src/com/massivecraft/massivecore/nms/NmsItemStackTooltip18R1P.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Method; - -import org.bukkit.entity.ArmorStand; -import org.bukkit.inventory.ItemStack; - import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.entity.ArmorStand; +import org.bukkit.inventory.ItemStack; + +import java.lang.reflect.Method; public class NmsItemStackTooltip18R1P extends NmsItemStackTooltip { diff --git a/src/com/massivecraft/massivecore/nms/NmsPermissions.java b/src/com/massivecraft/massivecore/nms/NmsPermissions.java index 972fddae..04b862c9 100644 --- a/src/com/massivecraft/massivecore/nms/NmsPermissions.java +++ b/src/com/massivecraft/massivecore/nms/NmsPermissions.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.nms; -import java.util.List; -import java.util.Map; - +import com.massivecraft.massivecore.mixin.Mixin; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.PermissionAttachment; -import com.massivecraft.massivecore.mixin.Mixin; + +import java.util.List; +import java.util.Map; public class NmsPermissions extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsPermissions17R4P.java b/src/com/massivecraft/massivecore/nms/NmsPermissions17R4P.java index ad19b7ea..260e2e59 100644 --- a/src/com/massivecraft/massivecore/nms/NmsPermissions17R4P.java +++ b/src/com/massivecraft/massivecore/nms/NmsPermissions17R4P.java @@ -1,16 +1,15 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Field; -import java.util.List; -import java.util.Map; - +import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; +import com.massivecraft.massivecore.util.ReflectionUtil; import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.PermissionAttachment; -import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; -import com.massivecraft.massivecore.util.ReflectionUtil; +import java.lang.reflect.Field; +import java.util.List; +import java.util.Map; public class NmsPermissions17R4P extends NmsPermissions { diff --git a/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate.java b/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate.java index cd3d1776..f137213f 100644 --- a/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate.java +++ b/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate.java @@ -1,8 +1,7 @@ package com.massivecraft.massivecore.nms; -import org.bukkit.inventory.PlayerInventory; - import com.massivecraft.massivecore.mixin.Mixin; +import org.bukkit.inventory.PlayerInventory; public class NmsPlayerInventoryCreate extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate17R4P.java b/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate17R4P.java index 7ebb41f0..43d43aa1 100644 --- a/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate17R4P.java +++ b/src/com/massivecraft/massivecore/nms/NmsPlayerInventoryCreate17R4P.java @@ -1,11 +1,10 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Constructor; - -import org.bukkit.inventory.PlayerInventory; - import com.massivecraft.massivecore.particleeffect.ReflectionUtils; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.inventory.PlayerInventory; + +import java.lang.reflect.Constructor; public class NmsPlayerInventoryCreate17R4P extends NmsPlayerInventoryCreate { diff --git a/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java b/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java index 4c6e24e0..71d0ac81 100644 --- a/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java +++ b/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java @@ -1,14 +1,13 @@ package com.massivecraft.massivecore.nms; -import java.util.UUID; - -import org.bukkit.inventory.meta.SkullMeta; - import com.massivecraft.massivecore.Couple; import com.massivecraft.massivecore.mixin.Mixin; import com.massivecraft.massivecore.util.IdData; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.inventory.meta.SkullMeta; + +import java.util.UUID; public class NmsSkullMeta extends Mixin { diff --git a/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java b/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java index 9441b801..1f7856da 100644 --- a/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java +++ b/src/com/massivecraft/massivecore/nms/NmsSkullMetaAbstract.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.nms; -import java.lang.reflect.Field; -import java.util.UUID; - -import org.bukkit.inventory.meta.SkullMeta; - import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.inventory.meta.SkullMeta; + +import java.lang.reflect.Field; +import java.util.UUID; public abstract class NmsSkullMetaAbstract extends NmsSkullMeta { diff --git a/src/com/massivecraft/massivecore/nms/NmsSkullMetaFallback.java b/src/com/massivecraft/massivecore/nms/NmsSkullMetaFallback.java index 7f4af55d..663f24af 100644 --- a/src/com/massivecraft/massivecore/nms/NmsSkullMetaFallback.java +++ b/src/com/massivecraft/massivecore/nms/NmsSkullMetaFallback.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.nms; -import java.util.UUID; - import org.bukkit.inventory.meta.SkullMeta; +import java.util.UUID; + public class NmsSkullMetaFallback extends NmsSkullMeta { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/pager/Pager.java b/src/com/massivecraft/massivecore/pager/Pager.java index 4e7aa6de..c7f454d8 100644 --- a/src/com/massivecraft/massivecore/pager/Pager.java +++ b/src/com/massivecraft/massivecore/pager/Pager.java @@ -5,16 +5,15 @@ import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - public class Pager { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java index d6edd887..d7df6ae1 100644 --- a/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java +++ b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java @@ -1,5 +1,13 @@ package com.massivecraft.massivecore.particleeffect; +import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.util.ReflectionUtil; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.util.Vector; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -9,15 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.util.Vector; - -import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; -import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.util.ReflectionUtil; - /** * ParticleEffect Library *

diff --git a/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java b/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java index 222db68c..d8104dea 100644 --- a/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java +++ b/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java @@ -1,5 +1,7 @@ package com.massivecraft.massivecore.particleeffect; +import org.bukkit.Bukkit; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -7,8 +9,6 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import org.bukkit.Bukkit; - /** * ReflectionUtils *

diff --git a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java index 07b5bdcc..e7ab24d9 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.predicate; +import com.google.common.collect.ImmutableList; + import java.util.Collection; import java.util.List; -import com.google.common.collect.ImmutableList; - public class PredicateAnd implements Predicate { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java b/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java index fa295650..04510da8 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.predicate; +import com.massivecraft.massivecore.collections.MassiveList; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; -import com.massivecraft.massivecore.collections.MassiveList; - public class PredicateElementRegexes implements Predicate { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/predicate/PredicateIntegration.java b/src/com/massivecraft/massivecore/predicate/PredicateIntegration.java index df34f12c..2473ef42 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateIntegration.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateIntegration.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.predicate; -import java.util.Collection; +import com.massivecraft.massivecore.Integration; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; -import com.massivecraft.massivecore.Integration; +import java.util.Collection; public class PredicateIntegration implements Predicate { diff --git a/src/com/massivecraft/massivecore/predicate/PredicateVisibleTo.java b/src/com/massivecraft/massivecore/predicate/PredicateVisibleTo.java index 0a7dbdd0..dec6b4fc 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateVisibleTo.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateVisibleTo.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.predicate; -import java.lang.ref.WeakReference; - -import org.bukkit.command.CommandSender; import com.massivecraft.massivecore.mixin.MixinVisibility; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.command.CommandSender; + +import java.lang.ref.WeakReference; public class PredicateVisibleTo implements Predicate { diff --git a/src/com/massivecraft/massivecore/ps/PS.java b/src/com/massivecraft/massivecore/ps/PS.java index 6f4555c9..23558b56 100644 --- a/src/com/massivecraft/massivecore/ps/PS.java +++ b/src/com/massivecraft/massivecore/ps/PS.java @@ -1,20 +1,5 @@ package com.massivecraft.massivecore.ps; -import java.io.Serializable; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.Map.Entry; -import java.util.Objects; - -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.entity.Entity; -import org.bukkit.util.Vector; - import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.Multiverse; @@ -23,6 +8,20 @@ import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import org.bukkit.Bukkit; +import org.bukkit.Chunk; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.util.Vector; + +import java.io.Serializable; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Set; /** * # Introduction diff --git a/src/com/massivecraft/massivecore/ps/PSAdapter.java b/src/com/massivecraft/massivecore/ps/PSAdapter.java index 8d4f021a..a4bf85f4 100644 --- a/src/com/massivecraft/massivecore/ps/PSAdapter.java +++ b/src/com/massivecraft/massivecore/ps/PSAdapter.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.ps; -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; import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import java.lang.reflect.Type; + public class PSAdapter implements JsonDeserializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java index 43fd9370..cdf8c07e 100644 --- a/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java +++ b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java @@ -1,11 +1,11 @@ package com.massivecraft.massivecore.ps; -import java.util.ArrayList; -import java.util.List; - import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.List; + public class PSFormatAbstract implements PSFormat { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/sender/BasicCommandSender.java b/src/com/massivecraft/massivecore/sender/BasicCommandSender.java index f6bd4513..09e6a14b 100644 --- a/src/com/massivecraft/massivecore/sender/BasicCommandSender.java +++ b/src/com/massivecraft/massivecore/sender/BasicCommandSender.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.sender; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.util.IdUtil; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissibleBase; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.util.IdUtil; - public class BasicCommandSender extends PermissibleBase implements CommandSender { public final String name; diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index dcf54ab8..e82c6da8 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -1,22 +1,5 @@ package com.massivecraft.massivecore.store; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -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.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListMap; - -import org.apache.commons.lang.StringUtils; -import org.bukkit.Bukkit; -import org.bukkit.plugin.Plugin; - import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.MassivePlugin; @@ -33,6 +16,22 @@ import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException; +import org.apache.commons.lang.StringUtils; +import org.bukkit.Bukkit; +import org.bukkit.plugin.Plugin; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +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.TreeMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentSkipListMap; public class Coll> extends CollAbstract { diff --git a/src/com/massivecraft/massivecore/store/CollAbstract.java b/src/com/massivecraft/massivecore/store/CollAbstract.java index 5da37b9d..363d2390 100644 --- a/src/com/massivecraft/massivecore/store/CollAbstract.java +++ b/src/com/massivecraft/massivecore/store/CollAbstract.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.predicate.Predicate; +import com.massivecraft.massivecore.util.MUtil; +import com.massivecraft.massivecore.xlib.gson.JsonObject; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map.Entry; -import com.massivecraft.massivecore.predicate.Predicate; -import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.xlib.gson.JsonObject; - public abstract class CollAbstract> implements CollInterface { diff --git a/src/com/massivecraft/massivecore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java index 691b4d5c..e403237f 100644 --- a/src/com/massivecraft/massivecore/store/CollInterface.java +++ b/src/com/massivecraft/massivecore/store/CollInterface.java @@ -1,11 +1,5 @@ package com.massivecraft.massivecore.store; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassivePlugin; @@ -13,6 +7,12 @@ import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + public interface CollInterface> extends Named, Active, Identified { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/Colls.java b/src/com/massivecraft/massivecore/store/Colls.java index 23227e7d..9ad5eeee 100644 --- a/src/com/massivecraft/massivecore/store/Colls.java +++ b/src/com/massivecraft/massivecore/store/Colls.java @@ -1,16 +1,16 @@ package com.massivecraft.massivecore.store; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.util.MUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public abstract class Colls, E extends Entity> implements Active { protected Map name2coll = new HashMap(); diff --git a/src/com/massivecraft/massivecore/store/Db.java b/src/com/massivecraft/massivecore/store/Db.java index 7ac05dfe..bdaa09f9 100644 --- a/src/com/massivecraft/massivecore/store/Db.java +++ b/src/com/massivecraft/massivecore/store/Db.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.xlib.gson.JsonObject; + import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.massivecore.xlib.gson.JsonObject; - public interface Db { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/DbAbstract.java b/src/com/massivecraft/massivecore/store/DbAbstract.java index 51138589..43e05644 100644 --- a/src/com/massivecraft/massivecore/store/DbAbstract.java +++ b/src/com/massivecraft/massivecore/store/DbAbstract.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.xlib.gson.JsonObject; + import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.massivecore.xlib.gson.JsonObject; - public abstract class DbAbstract implements Db { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/Driver.java b/src/com/massivecraft/massivecore/store/Driver.java index 7de09c69..05360e20 100644 --- a/src/com/massivecraft/massivecore/store/Driver.java +++ b/src/com/massivecraft/massivecore/store/Driver.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.xlib.gson.JsonObject; + import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.massivecore.xlib.gson.JsonObject; - public interface Driver { // Returns the name of the driver. diff --git a/src/com/massivecraft/massivecore/store/DriverFlatfile.java b/src/com/massivecraft/massivecore/store/DriverFlatfile.java index 1ed74fc6..b97c388d 100644 --- a/src/com/massivecraft/massivecore/store/DriverFlatfile.java +++ b/src/com/massivecraft/massivecore/store/DriverFlatfile.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.util.DiscUtil; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.gson.JsonParser; + import java.io.File; import java.io.IOException; import java.nio.file.FileSystems; @@ -15,10 +19,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.massivecore.util.DiscUtil; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.gson.JsonParser; - public class DriverFlatfile extends DriverAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/DriverMongo.java b/src/com/massivecraft/massivecore/store/DriverMongo.java index 76589f73..d3f940f7 100644 --- a/src/com/massivecraft/massivecore/store/DriverMongo.java +++ b/src/com/massivecraft/massivecore/store/DriverMongo.java @@ -1,5 +1,14 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.MassiveCoreMConf; +import com.massivecraft.massivecore.xlib.gson.JsonObject; +import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; +import com.massivecraft.massivecore.xlib.mongodb.DB; +import com.massivecraft.massivecore.xlib.mongodb.DBCollection; +import com.massivecraft.massivecore.xlib.mongodb.DBCursor; +import com.massivecraft.massivecore.xlib.mongodb.MongoClient; +import com.massivecraft.massivecore.xlib.mongodb.MongoClientURI; + import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; @@ -10,15 +19,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.massivecore.MassiveCoreMConf; -import com.massivecraft.massivecore.xlib.gson.JsonObject; -import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; -import com.massivecraft.massivecore.xlib.mongodb.DB; -import com.massivecraft.massivecore.xlib.mongodb.DBCollection; -import com.massivecraft.massivecore.xlib.mongodb.DBCursor; -import com.massivecraft.massivecore.xlib.mongodb.MongoClient; -import com.massivecraft.massivecore.xlib.mongodb.MongoClientURI; - public class DriverMongo extends DriverAbstract { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/Entity.java b/src/com/massivecraft/massivecore/store/Entity.java index 7ebd6f55..65bd8964 100644 --- a/src/com/massivecraft/massivecore/store/Entity.java +++ b/src/com/massivecraft/massivecore/store/Entity.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.store; -import java.util.Objects; - import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.store.accessor.Accessor; import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import java.util.Objects; + /** * Usage of this class is highly optional. You may persist anything. If you are * creating the class to be persisted yourself, it might be handy to extend this diff --git a/src/com/massivecraft/massivecore/store/GsonCloner.java b/src/com/massivecraft/massivecore/store/GsonCloner.java index 5b15d2f6..ca642ae3 100644 --- a/src/com/massivecraft/massivecore/store/GsonCloner.java +++ b/src/com/massivecraft/massivecore/store/GsonCloner.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.store; -import java.util.Iterator; -import java.util.Map.Entry; - import com.massivecraft.massivecore.xlib.gson.JsonArray; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonNull; import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import java.util.Iterator; +import java.util.Map.Entry; + public class GsonCloner { // All diff --git a/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java index 84ae15e5..8da0f0ad 100644 --- a/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java +++ b/src/com/massivecraft/massivecore/store/GsonEqualsChecker.java @@ -1,15 +1,14 @@ package com.massivecraft.massivecore.store; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; - import com.massivecraft.massivecore.xlib.gson.JsonArray; import com.massivecraft.massivecore.xlib.gson.JsonElement; 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.internal.LazilyParsedNumber; +import org.apache.commons.lang.StringUtils; + +import java.util.Map.Entry; public class GsonEqualsChecker { diff --git a/src/com/massivecraft/massivecore/store/GsonMongoConverter.java b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java index e9f066b4..1b127934 100644 --- a/src/com/massivecraft/massivecore/store/GsonMongoConverter.java +++ b/src/com/massivecraft/massivecore/store/GsonMongoConverter.java @@ -1,9 +1,5 @@ package com.massivecraft.massivecore.store; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; - import com.massivecraft.massivecore.xlib.bson.types.ObjectId; import com.massivecraft.massivecore.xlib.gson.JsonArray; import com.massivecraft.massivecore.xlib.gson.JsonElement; @@ -14,6 +10,9 @@ import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; import com.massivecraft.massivecore.xlib.mongodb.BasicDBList; import com.massivecraft.massivecore.xlib.mongodb.BasicDBObject; import com.massivecraft.massivecore.xlib.mongodb.DBObject; +import org.apache.commons.lang.StringUtils; + +import java.util.Map.Entry; public final class GsonMongoConverter { diff --git a/src/com/massivecraft/massivecore/store/MStore.java b/src/com/massivecraft/massivecore/store/MStore.java index eb6d54b1..f3cbc10c 100644 --- a/src/com/massivecraft/massivecore/store/MStore.java +++ b/src/com/massivecraft/massivecore/store/MStore.java @@ -1,14 +1,14 @@ package com.massivecraft.massivecore.store; +import com.massivecraft.massivecore.ConfServer; +import com.massivecraft.massivecore.xlib.gson.JsonElement; + import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import com.massivecraft.massivecore.ConfServer; -import com.massivecraft.massivecore.xlib.gson.JsonElement; - public class MStore { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/SenderColl.java b/src/com/massivecraft/massivecore/store/SenderColl.java index 3160195c..ae1072a6 100644 --- a/src/com/massivecraft/massivecore/store/SenderColl.java +++ b/src/com/massivecraft/massivecore/store/SenderColl.java @@ -1,11 +1,5 @@ package com.massivecraft.massivecore.store; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.bukkit.command.CommandSender; - import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; @@ -14,6 +8,11 @@ import com.massivecraft.massivecore.command.type.sender.TypeSenderId; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.command.CommandSender; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public class SenderColl> extends Coll implements SenderIdSource { diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index 5b937bf1..3c50cfbf 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -1,13 +1,5 @@ package com.massivecraft.massivecore.store; -import java.util.Collection; -import java.util.UUID; - -import org.bukkit.GameMode; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; - import com.google.common.base.Objects; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.PlayerState; @@ -19,6 +11,13 @@ import com.massivecraft.massivecore.mixin.MixinVisibility; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.PermissionUtil; +import org.bukkit.GameMode; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; + +import java.util.Collection; +import java.util.UUID; public abstract class SenderEntity> extends Entity implements Named { diff --git a/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java index 5d3533e0..ab549b8a 100644 --- a/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java +++ b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java @@ -1,13 +1,13 @@ package com.massivecraft.massivecore.store; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; import com.massivecraft.massivecore.util.IdUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class SenderIdSourceMixinAllSenderIds implements SenderIdSource { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java b/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java index 0cc59b7e..d68a181f 100644 --- a/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java +++ b/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.store.accessor; -import java.lang.reflect.Field; - import com.massivecraft.massivecore.util.ReflectionUtil; +import java.lang.reflect.Field; + public class FieldAccessor { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/migration/VersionMigrationUtil.java b/src/com/massivecraft/massivecore/store/migration/VersionMigrationUtil.java index 39d487ef..cdb1d63d 100644 --- a/src/com/massivecraft/massivecore/store/migration/VersionMigrationUtil.java +++ b/src/com/massivecraft/massivecore/store/migration/VersionMigrationUtil.java @@ -1,10 +1,5 @@ package com.massivecraft.massivecore.store.migration; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.store.Entity; @@ -12,6 +7,11 @@ import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class VersionMigrationUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/migration/VersionMigratorRoot.java b/src/com/massivecraft/massivecore/store/migration/VersionMigratorRoot.java index 64a21469..9d455f85 100644 --- a/src/com/massivecraft/massivecore/store/migration/VersionMigratorRoot.java +++ b/src/com/massivecraft/massivecore/store/migration/VersionMigratorRoot.java @@ -1,8 +1,5 @@ package com.massivecraft.massivecore.store.migration; -import java.util.List; -import java.util.regex.Matcher; - import com.massivecraft.massivecore.Active; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.collections.MassiveList; @@ -10,6 +7,9 @@ import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import java.util.List; +import java.util.regex.Matcher; + public class VersionMigratorRoot implements VersionMigrator, Active { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/teleport/Destination.java b/src/com/massivecraft/massivecore/teleport/Destination.java index a17e337e..7e6c94ff 100644 --- a/src/com/massivecraft/massivecore/teleport/Destination.java +++ b/src/com/massivecraft/massivecore/teleport/Destination.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.teleport; -import java.io.Serializable; - import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.ps.PS; +import java.io.Serializable; + public interface Destination extends Serializable { public PS getPs(Object watcherObject) throws MassiveException; diff --git a/src/com/massivecraft/massivecore/teleport/DestinationJump.java b/src/com/massivecraft/massivecore/teleport/DestinationJump.java index c7e0bddc..17657522 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationJump.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationJump.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.teleport; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.ps.PS; - public class DestinationJump extends DestinationPlayer { private static final long serialVersionUID = 1L; diff --git a/src/com/massivecraft/massivecore/teleport/DestinationPlayer.java b/src/com/massivecraft/massivecore/teleport/DestinationPlayer.java index 48e52dc0..054e5fb7 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationPlayer.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationPlayer.java @@ -1,14 +1,13 @@ package com.massivecraft.massivecore.teleport; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - import com.massivecraft.massivecore.mixin.MixinDisplayName; import com.massivecraft.massivecore.mixin.MixinPlayed; import com.massivecraft.massivecore.mixin.MixinSenderPs; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class DestinationPlayer extends DestinationAbstract { diff --git a/src/com/massivecraft/massivecore/teleport/DestinationThat.java b/src/com/massivecraft/massivecore/teleport/DestinationThat.java index 37ad10cc..2268ee61 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationThat.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationThat.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.teleport; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.ps.PS; - public class DestinationThat extends DestinationPlayer { private static final long serialVersionUID = 1L; diff --git a/src/com/massivecraft/massivecore/teleport/DestinationThere.java b/src/com/massivecraft/massivecore/teleport/DestinationThere.java index 3cbb32fd..dedb0474 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationThere.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationThere.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.teleport; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.ps.PS; - public class DestinationThere extends DestinationPlayer { private static final long serialVersionUID = 1L; diff --git a/src/com/massivecraft/massivecore/teleport/DestinationTop.java b/src/com/massivecraft/massivecore/teleport/DestinationTop.java index 32989c37..ac6d7df9 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationTop.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationTop.java @@ -1,10 +1,9 @@ package com.massivecraft.massivecore.teleport; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.ps.PS; - public class DestinationTop extends DestinationPlayer { private static final long serialVersionUID = 1L; diff --git a/src/com/massivecraft/massivecore/teleport/DestinationUtil.java b/src/com/massivecraft/massivecore/teleport/DestinationUtil.java index 78f9d749..ce742652 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationUtil.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationUtil.java @@ -1,7 +1,6 @@ package com.massivecraft.massivecore.teleport; -import java.util.Iterator; - +import com.massivecraft.massivecore.MassiveException; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; @@ -10,7 +9,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.util.BlockIterator; -import com.massivecraft.massivecore.MassiveException; +import java.util.Iterator; public class DestinationUtil { diff --git a/src/com/massivecraft/massivecore/teleport/DestinationWorld.java b/src/com/massivecraft/massivecore/teleport/DestinationWorld.java index f876f54d..2de74f63 100644 --- a/src/com/massivecraft/massivecore/teleport/DestinationWorld.java +++ b/src/com/massivecraft/massivecore/teleport/DestinationWorld.java @@ -1,13 +1,12 @@ package com.massivecraft.massivecore.teleport; +import com.massivecraft.massivecore.mixin.MixinWorld; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.massivecraft.massivecore.mixin.MixinWorld; -import com.massivecraft.massivecore.ps.PS; - public class DestinationWorld extends DestinationAbstract { private static final long serialVersionUID = 1L; diff --git a/src/com/massivecraft/massivecore/util/BoardUtil.java b/src/com/massivecraft/massivecore/util/BoardUtil.java index 42b42a9c..d7ef61f5 100644 --- a/src/com/massivecraft/massivecore/util/BoardUtil.java +++ b/src/com/massivecraft/massivecore/util/BoardUtil.java @@ -1,12 +1,13 @@ package com.massivecraft.massivecore.util; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.UUID; - +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.collections.MassiveMap; +import com.massivecraft.massivecore.collections.MassiveSet; +import com.massivecraft.massivecore.event.EventMassiveCoreBoardEnsure; +import com.massivecraft.massivecore.nms.NmsBoard; +import com.massivecraft.massivecore.nms.TeamOptionKey; +import com.massivecraft.massivecore.nms.TeamOptionValue; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Entity; @@ -20,14 +21,12 @@ import org.bukkit.scoreboard.Score; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.collections.MassiveSet; -import com.massivecraft.massivecore.event.EventMassiveCoreBoardEnsure; -import com.massivecraft.massivecore.nms.NmsBoard; -import com.massivecraft.massivecore.nms.TeamOptionKey; -import com.massivecraft.massivecore.nms.TeamOptionValue; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; // # RESEARCH > CLEANUP // The main server scoreboard is the only one that is saved to NBT. diff --git a/src/com/massivecraft/massivecore/util/ContainerUtil.java b/src/com/massivecraft/massivecore/util/ContainerUtil.java index 81bbbdc5..95a4ddfa 100644 --- a/src/com/massivecraft/massivecore/util/ContainerUtil.java +++ b/src/com/massivecraft/massivecore/util/ContainerUtil.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.util; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.collections.MassiveMap; +import com.massivecraft.massivecore.collections.MassiveSet; + import java.util.Collection; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -10,10 +14,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.collections.MassiveSet; - /** * The ContainerUtil provides an imaginary super class to Collection and Map. * In Java they do not have a common interface yet many methods are similar and exists in both. diff --git a/src/com/massivecraft/massivecore/util/DiscUtil.java b/src/com/massivecraft/massivecore/util/DiscUtil.java index 1b996fcc..ca4a3d38 100644 --- a/src/com/massivecraft/massivecore/util/DiscUtil.java +++ b/src/com/massivecraft/massivecore/util/DiscUtil.java @@ -1,6 +1,12 @@ package com.massivecraft.massivecore.util; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; public class DiscUtil { diff --git a/src/com/massivecraft/massivecore/util/EventUtil.java b/src/com/massivecraft/massivecore/util/EventUtil.java index af986a1e..53d2db13 100644 --- a/src/com/massivecraft/massivecore/util/EventUtil.java +++ b/src/com/massivecraft/massivecore/util/EventUtil.java @@ -1,8 +1,5 @@ package com.massivecraft.massivecore.util; -import java.lang.reflect.Field; -import java.util.logging.Level; - import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.EventPriority; @@ -12,6 +9,9 @@ import org.bukkit.plugin.AuthorNagException; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredListener; +import java.lang.reflect.Field; +import java.util.logging.Level; + public class EventUtil { public static Field fieldRegisteredListenerDotPriority; diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java index 4a9c3036..2cbeeaa8 100644 --- a/src/com/massivecraft/massivecore/util/IdUtil.java +++ b/src/com/massivecraft/massivecore/util/IdUtil.java @@ -1,17 +1,15 @@ package com.massivecraft.massivecore.util; -import java.io.File; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListMap; - +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.SenderPresence; +import com.massivecraft.massivecore.SenderType; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderRegister; +import com.massivecraft.massivecore.event.EventMassiveCoreSenderUnregister; +import com.massivecraft.massivecore.mixin.MixinActual; +import com.massivecraft.massivecore.mixin.MixinPlayed; +import com.massivecraft.massivecore.store.SenderEntity; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; @@ -24,16 +22,17 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.SenderPresence; -import com.massivecraft.massivecore.SenderType; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; -import com.massivecraft.massivecore.event.EventMassiveCoreSenderRegister; -import com.massivecraft.massivecore.event.EventMassiveCoreSenderUnregister; -import com.massivecraft.massivecore.mixin.MixinActual; -import com.massivecraft.massivecore.mixin.MixinPlayed; -import com.massivecraft.massivecore.store.SenderEntity; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import java.io.File; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentSkipListMap; /** * Identification of a CommandSender can be done in 4 different ways. diff --git a/src/com/massivecraft/massivecore/util/IntervalUtil.java b/src/com/massivecraft/massivecore/util/IntervalUtil.java index 4b30dc4b..26f7876b 100644 --- a/src/com/massivecraft/massivecore/util/IntervalUtil.java +++ b/src/com/massivecraft/massivecore/util/IntervalUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.util; +import com.massivecraft.massivecore.MassiveCore; + import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import com.massivecraft.massivecore.MassiveCore; - public class IntervalUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/InventoryUtil.java b/src/com/massivecraft/massivecore/util/InventoryUtil.java index 997f5001..4277e2bc 100644 --- a/src/com/massivecraft/massivecore/util/InventoryUtil.java +++ b/src/com/massivecraft/massivecore/util/InventoryUtil.java @@ -1,15 +1,13 @@ package com.massivecraft.massivecore.util; -import java.util.AbstractMap.SimpleEntry; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; - +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.comparator.ComparatorComparable; +import com.massivecraft.massivecore.comparator.ComparatorEntryValue; +import com.massivecraft.massivecore.event.EventMassiveCoreLorePriority; +import com.massivecraft.massivecore.mixin.MixinInventory; +import com.massivecraft.massivecore.predicate.Predicate; +import com.massivecraft.massivecore.predicate.PredicateStringStartsWith; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.HumanEntity; @@ -27,14 +25,15 @@ import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.material.MaterialData; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.comparator.ComparatorComparable; -import com.massivecraft.massivecore.comparator.ComparatorEntryValue; -import com.massivecraft.massivecore.event.EventMassiveCoreLorePriority; -import com.massivecraft.massivecore.mixin.MixinInventory; -import com.massivecraft.massivecore.predicate.Predicate; -import com.massivecraft.massivecore.predicate.PredicateStringStartsWith; +import java.util.AbstractMap.SimpleEntry; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; public class InventoryUtil { diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java index 050c3f33..4a78d835 100644 --- a/src/com/massivecraft/massivecore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -1,29 +1,27 @@ package com.massivecraft.massivecore.util; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.UUID; -import java.util.regex.Pattern; - +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.collections.ExceptionSet; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.collections.MassiveSet; +import com.massivecraft.massivecore.collections.MassiveTreeSet; +import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; +import com.massivecraft.massivecore.engine.EngineMassiveCoreDatabase; +import com.massivecraft.massivecore.engine.EngineMassiveCoreMain; +import com.massivecraft.massivecore.engine.EngineMassiveCoreWorldNameSet; +import com.massivecraft.massivecore.mixin.MixinMessage; +import com.massivecraft.massivecore.nms.NmsEntityGet; +import com.massivecraft.massivecore.predicate.Predicate; +import com.massivecraft.massivecore.predicate.PredicateElementGarbage; +import com.massivecraft.massivecore.predicate.PredicateElementSignificant; +import com.massivecraft.massivecore.util.extractor.Extractor; +import com.massivecraft.massivecore.util.extractor.ExtractorPlayer; +import com.massivecraft.massivecore.util.extractor.ExtractorPlayerName; +import com.massivecraft.massivecore.util.extractor.ExtractorSender; +import com.massivecraft.massivecore.util.extractor.ExtractorSenderId; +import com.massivecraft.massivecore.util.extractor.ExtractorSenderName; +import com.massivecraft.massivecore.util.extractor.ExtractorWorld; +import com.massivecraft.massivecore.util.extractor.ExtractorWorldName; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.DyeColor; @@ -57,28 +55,29 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.collections.ExceptionSet; -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.collections.MassiveSet; -import com.massivecraft.massivecore.collections.MassiveTreeSet; -import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; -import com.massivecraft.massivecore.engine.EngineMassiveCoreDatabase; -import com.massivecraft.massivecore.engine.EngineMassiveCoreMain; -import com.massivecraft.massivecore.engine.EngineMassiveCoreWorldNameSet; -import com.massivecraft.massivecore.mixin.MixinMessage; -import com.massivecraft.massivecore.nms.NmsEntityGet; -import com.massivecraft.massivecore.predicate.Predicate; -import com.massivecraft.massivecore.predicate.PredicateElementGarbage; -import com.massivecraft.massivecore.predicate.PredicateElementSignificant; -import com.massivecraft.massivecore.util.extractor.Extractor; -import com.massivecraft.massivecore.util.extractor.ExtractorPlayer; -import com.massivecraft.massivecore.util.extractor.ExtractorPlayerName; -import com.massivecraft.massivecore.util.extractor.ExtractorSender; -import com.massivecraft.massivecore.util.extractor.ExtractorSenderId; -import com.massivecraft.massivecore.util.extractor.ExtractorSenderName; -import com.massivecraft.massivecore.util.extractor.ExtractorWorld; -import com.massivecraft.massivecore.util.extractor.ExtractorWorldName; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.UUID; +import java.util.regex.Pattern; public class MUtil { diff --git a/src/com/massivecraft/massivecore/util/PeriodUtil.java b/src/com/massivecraft/massivecore/util/PeriodUtil.java index c8a9d41d..0d81f2a9 100644 --- a/src/com/massivecraft/massivecore/util/PeriodUtil.java +++ b/src/com/massivecraft/massivecore/util/PeriodUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.util; +import org.bukkit.Bukkit; + import java.util.HashMap; import java.util.Map; -import org.bukkit.Bukkit; - public class PeriodUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/PermissionUtil.java b/src/com/massivecraft/massivecore/util/PermissionUtil.java index 4dd42278..1e2e4247 100644 --- a/src/com/massivecraft/massivecore/util/PermissionUtil.java +++ b/src/com/massivecraft/massivecore/util/PermissionUtil.java @@ -1,9 +1,10 @@ package com.massivecraft.massivecore.util; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import com.massivecraft.massivecore.Identified; +import com.massivecraft.massivecore.Lang; +import com.massivecraft.massivecore.MassiveCore; +import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; +import com.massivecraft.massivecore.nms.NmsPermissions; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; @@ -13,11 +14,9 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; -import com.massivecraft.massivecore.Identified; -import com.massivecraft.massivecore.Lang; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; -import com.massivecraft.massivecore.nms.NmsPermissions; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class PermissionUtil { diff --git a/src/com/massivecraft/massivecore/util/PlayerUtil.java b/src/com/massivecraft/massivecore/util/PlayerUtil.java index 896b0051..8579e51e 100644 --- a/src/com/massivecraft/massivecore/util/PlayerUtil.java +++ b/src/com/massivecraft/massivecore/util/PlayerUtil.java @@ -1,8 +1,6 @@ package com.massivecraft.massivecore.util; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; +import com.massivecraft.massivecore.Engine; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -16,7 +14,10 @@ import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerRespawnEvent; -import com.massivecraft.massivecore.Engine; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; public class PlayerUtil extends Engine { diff --git a/src/com/massivecraft/massivecore/util/ReflectionUtil.java b/src/com/massivecraft/massivecore/util/ReflectionUtil.java index 4ff50c78..6f1c7261 100644 --- a/src/com/massivecraft/massivecore/util/ReflectionUtil.java +++ b/src/com/massivecraft/massivecore/util/ReflectionUtil.java @@ -1,5 +1,8 @@ package com.massivecraft.massivecore.util; +import com.massivecraft.massivecore.predicate.Predicate; +import org.bukkit.Bukkit; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -11,10 +14,6 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import org.bukkit.Bukkit; - -import com.massivecraft.massivecore.predicate.Predicate; - public class ReflectionUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/SenderMap.java b/src/com/massivecraft/massivecore/util/SenderMap.java index 1a757843..6c86b2b0 100644 --- a/src/com/massivecraft/massivecore/util/SenderMap.java +++ b/src/com/massivecraft/massivecore/util/SenderMap.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.util; +import com.google.common.collect.ImmutableList; +import com.massivecraft.massivecore.SenderPresence; +import com.massivecraft.massivecore.SenderType; + import java.util.Collections; import java.util.EnumMap; import java.util.List; @@ -7,10 +11,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; -import com.google.common.collect.ImmutableList; -import com.massivecraft.massivecore.SenderPresence; -import com.massivecraft.massivecore.SenderType; - public final class SenderMap { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/SignUtil.java b/src/com/massivecraft/massivecore/util/SignUtil.java index de1df3a1..229b2e85 100644 --- a/src/com/massivecraft/massivecore/util/SignUtil.java +++ b/src/com/massivecraft/massivecore/util/SignUtil.java @@ -1,11 +1,5 @@ package com.massivecraft.massivecore.util; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; - import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.World; @@ -17,6 +11,12 @@ import org.bukkit.event.block.Action; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.player.PlayerInteractEvent; +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; + public class SignUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/SmokeUtil.java b/src/com/massivecraft/massivecore/util/SmokeUtil.java index 59d7a299..9069c2e7 100644 --- a/src/com/massivecraft/massivecore/util/SmokeUtil.java +++ b/src/com/massivecraft/massivecore/util/SmokeUtil.java @@ -1,12 +1,12 @@ package com.massivecraft.massivecore.util; -import java.util.Collection; -import java.util.Random; - import org.apache.commons.lang.mutable.MutableBoolean; import org.bukkit.Effect; import org.bukkit.Location; +import java.util.Collection; +import java.util.Random; + // http://mc.kev009.com/Protocol // ----------------------------- // Smoke Directions diff --git a/src/com/massivecraft/massivecore/util/Txt.java b/src/com/massivecraft/massivecore/util/Txt.java index dc2f0ace..168fab54 100644 --- a/src/com/massivecraft/massivecore/util/Txt.java +++ b/src/com/massivecraft/massivecore/util/Txt.java @@ -1,6 +1,18 @@ package com.massivecraft.massivecore.util; -import static com.massivecraft.massivecore.mson.Mson.mson; +import com.massivecraft.massivecore.collections.MassiveList; +import com.massivecraft.massivecore.command.MassiveCommand; +import com.massivecraft.massivecore.command.massivecore.CmdMassiveCore; +import com.massivecraft.massivecore.mson.Mson; +import com.massivecraft.massivecore.mson.MsonEvent; +import com.massivecraft.massivecore.predicate.Predicate; +import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; @@ -14,20 +26,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - -import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.command.massivecore.CmdMassiveCore; -import com.massivecraft.massivecore.mson.Mson; -import com.massivecraft.massivecore.mson.MsonEvent; -import com.massivecraft.massivecore.predicate.Predicate; -import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; +import static com.massivecraft.massivecore.mson.Mson.mson; public class Txt { diff --git a/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java b/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java index a63348ac..c6b6441d 100644 --- a/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java +++ b/src/com/massivecraft/massivecore/util/extractor/ExtractorLogic.java @@ -1,5 +1,9 @@ package com.massivecraft.massivecore.util.extractor; +import com.massivecraft.massivecore.mixin.MixinSenderPs; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.IdUtil; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; @@ -25,11 +29,6 @@ import org.bukkit.event.vehicle.VehicleEnterEvent; import org.bukkit.event.vehicle.VehicleEvent; import org.bukkit.event.vehicle.VehicleExitEvent; -import com.massivecraft.massivecore.mixin.MixinSenderPs; -import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.util.IdUtil; -import com.massivecraft.massivecore.util.MUtil; - public class ExtractorLogic { // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/xlib/gson/Gson.java b/src/com/massivecraft/massivecore/xlib/gson/Gson.java index d95fae1a..527800db 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/Gson.java +++ b/src/com/massivecraft/massivecore/xlib/gson/Gson.java @@ -16,21 +16,6 @@ package com.massivecraft.massivecore.xlib.gson; -import java.io.EOFException; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.reflect.Type; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.massivecraft.massivecore.xlib.gson.internal.ConstructorConstructor; import com.massivecraft.massivecore.xlib.gson.internal.Excluder; import com.massivecraft.massivecore.xlib.gson.internal.Primitives; @@ -53,6 +38,21 @@ import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException; +import java.io.EOFException; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * This is the main class for using Gson. Gson is typically used by first constructing a * Gson instance and then invoking {@link #toJson(Object)} or {@link #fromJson(String, Class)} diff --git a/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java index 82c80f49..032672db 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java +++ b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java @@ -16,6 +16,11 @@ package com.massivecraft.massivecore.xlib.gson; +import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions; +import com.massivecraft.massivecore.xlib.gson.internal.Excluder; +import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; + import java.lang.reflect.Type; import java.sql.Timestamp; import java.text.DateFormat; @@ -26,11 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions; -import com.massivecraft.massivecore.xlib.gson.internal.Excluder; -import com.massivecraft.massivecore.xlib.gson.internal.bind.TypeAdapters; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; - /** *

Use this builder to construct a {@link Gson} instance when you need to set configuration * options other than the default. For {@link Gson} with default configuration, it is simpler to diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java b/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java index 7c094ad5..f2110bac 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java +++ b/src/com/massivecraft/massivecore/xlib/gson/JsonParser.java @@ -15,15 +15,15 @@ */ package com.massivecraft.massivecore.xlib.gson; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; - import com.massivecraft.massivecore.xlib.gson.internal.Streams; import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + /** * A parser to parse Json into a parse tree of {@link JsonElement}s * diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java b/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java index 9f9166fc..a301b452 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java +++ b/src/com/massivecraft/massivecore/xlib/gson/JsonPrimitive.java @@ -16,12 +16,12 @@ package com.massivecraft.massivecore.xlib.gson; -import java.math.BigDecimal; -import java.math.BigInteger; - import com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions; import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; +import java.math.BigDecimal; +import java.math.BigInteger; + /** * A class representing a Json primitive value. A primitive value * is either a String, a Java primitive, or a Java primitive diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java b/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java index 24b0c2f0..350e19c5 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java +++ b/src/com/massivecraft/massivecore/xlib/gson/JsonStreamParser.java @@ -15,6 +15,11 @@ */ package com.massivecraft.massivecore.xlib.gson; +import com.massivecraft.massivecore.xlib.gson.internal.Streams; +import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; +import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; +import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException; + import java.io.EOFException; import java.io.IOException; import java.io.Reader; @@ -22,11 +27,6 @@ import java.io.StringReader; import java.util.Iterator; import java.util.NoSuchElementException; -import com.massivecraft.massivecore.xlib.gson.internal.Streams; -import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; -import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; -import com.massivecraft.massivecore.xlib.gson.stream.MalformedJsonException; - /** * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader * asynchronously. diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java index c244b388..0534f3c0 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java +++ b/src/com/massivecraft/massivecore/xlib/gson/internal/$Gson$Types.java @@ -16,9 +16,6 @@ package com.massivecraft.massivecore.xlib.gson.internal; -import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkArgument; -import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkNotNull; - import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; @@ -34,6 +31,9 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Properties; +import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkArgument; +import static com.massivecraft.massivecore.xlib.gson.internal.$Gson$Preconditions.checkNotNull; + /** * Static methods for working with types. * diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java index 4ed1320d..cf6284d2 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java +++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java @@ -16,13 +16,6 @@ package com.massivecraft.massivecore.xlib.gson.internal.bind; -import java.io.IOException; -import java.lang.reflect.Array; -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; - import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.TypeAdapter; import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; @@ -32,6 +25,13 @@ import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; +import java.io.IOException; +import java.lang.reflect.Array; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + /** * Adapt an array of objects. */ diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java index a6de9755..2d3b92a1 100644 --- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java +++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java @@ -16,6 +16,23 @@ package com.massivecraft.massivecore.xlib.gson.internal.bind; +import com.massivecraft.massivecore.xlib.gson.Gson; +import com.massivecraft.massivecore.xlib.gson.JsonArray; +import com.massivecraft.massivecore.xlib.gson.JsonElement; +import com.massivecraft.massivecore.xlib.gson.JsonIOException; +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.JsonSyntaxException; +import com.massivecraft.massivecore.xlib.gson.TypeAdapter; +import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; +import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; +import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; +import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; +import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; + import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; @@ -34,23 +51,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.UUID; -import com.massivecraft.massivecore.xlib.gson.Gson; -import com.massivecraft.massivecore.xlib.gson.JsonArray; -import com.massivecraft.massivecore.xlib.gson.JsonElement; -import com.massivecraft.massivecore.xlib.gson.JsonIOException; -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.JsonSyntaxException; -import com.massivecraft.massivecore.xlib.gson.TypeAdapter; -import com.massivecraft.massivecore.xlib.gson.TypeAdapterFactory; -import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; -import com.massivecraft.massivecore.xlib.gson.internal.LazilyParsedNumber; -import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; -import com.massivecraft.massivecore.xlib.gson.stream.JsonReader; -import com.massivecraft.massivecore.xlib.gson.stream.JsonToken; -import com.massivecraft.massivecore.xlib.gson.stream.JsonWriter; - /** * Type adapters for basic types. */ diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java index f0d44ed3..f1a2ef27 100644 --- a/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java +++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java @@ -19,7 +19,6 @@ package com.massivecraft.massivecore.xlib.mongodb; import com.massivecraft.massivecore.xlib.mongodb.util.ThreadUtil; - import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; @@ -34,7 +33,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.sasl.Sasl; import javax.security.sasl.SaslClient; import javax.security.sasl.SaslException; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java index f02f1953..cc58f834 100644 --- a/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java +++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java @@ -17,7 +17,6 @@ package com.massivecraft.massivecore.xlib.mongodb; import javax.net.ssl.SSLSocketFactory; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.ArrayList; diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/SocketSettings.java b/src/com/massivecraft/massivecore/xlib/mongodb/SocketSettings.java index 30f86acd..1425a942 100644 --- a/src/com/massivecraft/massivecore/xlib/mongodb/SocketSettings.java +++ b/src/com/massivecraft/massivecore/xlib/mongodb/SocketSettings.java @@ -17,7 +17,6 @@ package com.massivecraft.massivecore.xlib.mongodb; import javax.net.SocketFactory; - import java.util.concurrent.TimeUnit; import static com.massivecraft.massivecore.xlib.bson.util.Assertions.notNull; diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java index 1c275139..e1529988 100644 --- a/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java +++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/management/jmx/JMXMBeanServer.java @@ -21,7 +21,6 @@ import com.massivecraft.massivecore.xlib.mongodb.util.management.MBeanServer; import javax.management.InstanceAlreadyExistsException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; - import java.lang.management.ManagementFactory; import java.util.logging.Level; import java.util.logging.Logger;