Clean Imports

Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.command.Command;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.PluginCommandYamlParser;

Essentials/src/com/earth2me/essentials/Backup.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -17,11 +17,7 @@
  */
 package com.earth2me.essentials;
 
-import net.ess3.api.ISettings;
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.Economy;
-import net.ess3.api.IJails;
 import com.earth2me.essentials.commands.EssentialsCommand;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.commands.NoChargeException;
@@ -48,7 +44,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import net.ess3.api.Economy;
+import net.ess3.api.IEssentials;
 import net.ess3.api.IItemDb;
+import net.ess3.api.IJails;
+import net.ess3.api.ISettings;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;

Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.utils.LocationUtil;
 import java.util.Locale;
+import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;

Essentials/src/com/earth2me/essentials/EssentialsConf.java

@@ -1,8 +1,6 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-
-import net.ess3.api.InvalidWorldException;
 import com.google.common.io.Files;
 import java.io.*;
 import java.math.BigDecimal;
@@ -20,6 +18,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.InvalidWorldException;
 import org.bukkit.*;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
@@ -117,14 +116,16 @@ public class EssentialsConf extends YamlConfiguration
 			try
 			{
 				long startSize = configFile.length();
-				if (startSize > Integer.MAX_VALUE) {
+				if (startSize > Integer.MAX_VALUE)
+				{
 					throw new InvalidConfigurationException("File too big");
 				}
 				ByteBuffer buffer = ByteBuffer.allocate((int)startSize);
 				int length;
 				while ((length = inputStream.read(bytebuffer)) != -1)
 				{
-					if (length > buffer.remaining()) {
+					if (length > buffer.remaining())
+					{
 						ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
 						int resizePosition = buffer.position();
 						buffer.rewind();
@@ -523,7 +524,6 @@ public class EssentialsConf extends YamlConfiguration
 		return super.get(path, def);
 	}
 
-	
 	public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def)
 	{
 		final String input = super.getString(path);
@@ -809,5 +809,4 @@ public class EssentialsConf extends YamlConfiguration
 	{
 		super.set(path, value);
 	}
-
 }

Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
@@ -14,10 +13,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.World;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -26,8 +25,8 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;

Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.perm.PermissionsHandler;
-import net.ess3.api.IEssentials;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

Essentials/src/com/earth2me/essentials/EssentialsTimer.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;
 
 

Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java

@@ -1,11 +1,10 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import com.earth2me.essentials.utils.StringUtil;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.FakeWorld;
 import com.earth2me.essentials.settings.Spawns;
 import com.earth2me.essentials.storage.YamlStorageWriter;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -13,6 +12,7 @@ import java.security.MessageDigest;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;

Essentials/src/com/earth2me/essentials/I18n.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -12,6 +11,7 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
 
 
 public class I18n implements net.ess3.api.II18n

Essentials/src/com/earth2me/essentials/ItemDb.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import com.earth2me.essentials.utils.StringUtil;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.*;
 import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/com/earth2me/essentials/Jails.java

@@ -1,13 +1,13 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;

Essentials/src/com/earth2me/essentials/Kit.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import static com.earth2me.essentials.I18n.capitalCase;
 import com.earth2me.essentials.Trade.OverflowType;
@@ -9,11 +8,12 @@ import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.NumberUtil;
 import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

Essentials/src/com/earth2me/essentials/ManagedFile.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.math.BigInteger;
@@ -12,6 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 

Essentials/src/com/earth2me/essentials/MetaItemStack.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.textreader.BookInput;
 import com.earth2me.essentials.textreader.BookPager;
@@ -9,6 +8,7 @@ import com.earth2me.essentials.utils.FormatUtil;
 import com.earth2me.essentials.utils.NumberUtil;
 import java.util.*;
 import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
 import org.bukkit.FireworkEffect;

Essentials/src/com/earth2me/essentials/Mob.java

@@ -9,7 +9,6 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 
 
 // Suffixes can be appended on the end of a mob name to make it plural
@@ -131,6 +130,7 @@ public enum Mob
 		return bukkitMap.get(type);
 	}
 
+
 	public static class MobException extends Exception
 	{
 		private static final long serialVersionUID = 1L;

Essentials/src/com/earth2me/essentials/MobData.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.*;
 import java.util.logging.Logger;
-import com.earth2me.essentials.utils.StringUtil;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Ageable;
@@ -38,13 +38,10 @@ public enum MobData
 	BABY_SHEEP("lamb", EntityType.SHEEP, Data.BABY, false),
 	BABY_COW("calf", EntityType.COW.getEntityClass(), Data.BABY, false),
 	BABY_VILLAGER("child", EntityType.VILLAGER, Data.BABY, false),
-	
 	TAMED_TAMEABLE("tamed", Tameable.class, Data.TAMED, true),
 	TAME_TAMEABLE("tame", Tameable.class, Data.TAMED, false),
-	
 	RANDOM_SHEEP("random", EntityType.SHEEP, Data.COLORABLE, true),
 	COLORABLE_SHEEP("", StringUtil.joinList(DyeColor.values()).toLowerCase(Locale.ENGLISH), EntityType.SHEEP, Data.COLORABLE, true),
-	
 	DONKEY_HORSE("donkey", EntityType.HORSE, Horse.Variant.DONKEY, true),
 	MULE_HORSE("mule", EntityType.HORSE, Horse.Variant.MULE, true),
 	SKELETON_HORSE("skeleton", EntityType.HORSE, Horse.Variant.SKELETON_HORSE, true),
@@ -77,7 +74,6 @@ public enum MobData
 	GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, Material.GOLD_BARDING, true),
 	DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, Material.DIAMOND_BARDING, true),
 	ARMOR_HORSE("armor", EntityType.HORSE, Material.IRON_BARDING, true),
-	
 	SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true),
 	WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false),
 	RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true),
@@ -85,42 +81,35 @@ public enum MobData
 	TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
 	BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true),
 	TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false),
-	
 	VILLAGER_ZOMBIE("villager", EntityType.ZOMBIE.getEntityClass(), Data.VILLAGER, true),
 	BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
-	
 	DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
 	GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), Material.GOLD_SWORD, true),
 	IRON_SWORD_ZOMBIE("ironsword", EntityType.ZOMBIE.getEntityClass(), Material.IRON_SWORD, true),
 	STONE_SWORD_ZOMBIE("stonesword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, false),
 	SWORD_ZOMBIE("sword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, true),
-	
 	DIAMOND_SWORD_SKELETON("diamondsword", EntityType.SKELETON, Material.DIAMOND_SWORD, true),
 	GOLD_SWORD_SKELETON("goldsword", EntityType.SKELETON, Material.GOLD_SWORD, true),
 	IRON_SWORD_SKELETON("ironsword", EntityType.SKELETON, Material.IRON_SWORD, true),
 	STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false),
 	SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true),
 	WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
-	
 	POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
 	ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
 	CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),
-	
 	SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
-	
 	ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
 	RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
-	
 	FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
 	LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
 	PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
 	FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
 	SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
 	BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
-	
 	SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
 	NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
 
+
 	public enum Data
 	{
 		BABY,
@@ -158,13 +147,11 @@ public enum MobData
 		this.value = value;
 		this.isPublic = isPublic;
 	}
-
 	final private String nickname;
 	final private String helpMessage;
 	final private Object type;
 	final private Object value;
 	final private boolean isPublic;
-	
 	private String matched;
 
 	public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly)

Essentials/src/com/earth2me/essentials/OfflinePlayer.java

@@ -1,10 +1,10 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import java.net.InetSocketAddress;
 import java.util.*;
 import lombok.Delegate;
+import net.ess3.api.IEssentials;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.conversations.Conversation;

Essentials/src/com/earth2me/essentials/Settings.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.signs.EssentialsSign;
@@ -13,6 +12,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
@@ -651,9 +651,9 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return config.getBoolean("trade-in-stacks-" + id, false);
 	}
-	
 	// #easteregg
 	private boolean economyDisabled = false;
+
 	public boolean _isEcoDisabled()
 	{
 		return config.getBoolean("disable-eco", false);

Essentials/src/com/earth2me/essentials/SpawnMob.java

@@ -1,15 +1,15 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.Mob.MobException;
 import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import net.ess3.api.IEssentials;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Server;

Essentials/src/com/earth2me/essentials/Teleport.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.LocationUtil;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerRespawnEvent;

Essentials/src/com/earth2me/essentials/TimedTeleport.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
-import static com.earth2me.essentials.I18n._;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 

Essentials/src/com/earth2me/essentials/Trade.java

@@ -1,7 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
@@ -15,6 +13,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;

Essentials/src/com/earth2me/essentials/User.java

@@ -1,17 +1,17 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.register.payment.Method;
-import com.earth2me.essentials.utils.NumberUtil;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/UserData.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import com.earth2me.essentials.utils.StringUtil;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
+import net.ess3.api.IEssentials;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;

Essentials/src/com/earth2me/essentials/UserMap.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -11,6 +10,7 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ExecutionException;
+import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;
 
 

Essentials/src/com/earth2me/essentials/Warps.java

@@ -1,15 +1,15 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.utils.StringUtil;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.InvalidNameException;
-import net.ess3.api.InvalidWorldException;
 import com.earth2me.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.InvalidWorldException;
 import org.bukkit.Location;
 import org.bukkit.Server;
 

Essentials/src/com/earth2me/essentials/api/Economy.java

@@ -1,26 +1,26 @@
 package com.earth2me.essentials.api;
 
-import static net.ess3.api.Economy.add;
-import static net.ess3.api.Economy.divide;
-import static net.ess3.api.Economy.format;
-import static net.ess3.api.Economy.getMoneyExact;
-import static net.ess3.api.Economy.hasEnough;
-import static net.ess3.api.Economy.hasLess;
-import static net.ess3.api.Economy.hasMore;
-import static net.ess3.api.Economy.multiply;
-import static net.ess3.api.Economy.setMoney;
-import static net.ess3.api.Economy.substract;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.EssentialsConf;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.StringUtil;
+import static com.earth2me.essentials.api.Economy.add;
+import static com.earth2me.essentials.api.Economy.divide;
+import static com.earth2me.essentials.api.Economy.format;
+import static com.earth2me.essentials.api.Economy.getMoneyExact;
+import static com.earth2me.essentials.api.Economy.hasEnough;
+import static com.earth2me.essentials.api.Economy.hasLess;
+import static com.earth2me.essentials.api.Economy.hasMore;
+import static com.earth2me.essentials.api.Economy.multiply;
+import static com.earth2me.essentials.api.Economy.setMoney;
+import static com.earth2me.essentials.api.Economy.substract;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 
 
 /**

Essentials/src/com/earth2me/essentials/commands/Commandafk.java

@@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import org.bukkit.command.CommandSender;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandafk extends EssentialsCommand

Essentials/src/com/earth2me/essentials/commands/Commandmail.java

@@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.List;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/commands/Commandptime.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.utils.DescParseTickFormat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.DescParseTickFormat;
 import java.util.*;
 import org.bukkit.Server;
 import org.bukkit.World;

Essentials/src/com/earth2me/essentials/commands/Commandrepair.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
-import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.StringUtil;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import net.ess3.api.IUser;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;

Essentials/src/com/earth2me/essentials/commands/Commandseen.java

@@ -3,9 +3,9 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.UserMap;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.ArrayList;
 import java.util.List;
 import org.bukkit.Location;

Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java

@@ -3,8 +3,8 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import org.bukkit.Location;
 import org.bukkit.Server;
 

Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java

@@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import org.bukkit.command.CommandSender;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandsocialspy extends EssentialsToggleCommand

Essentials/src/com/earth2me/essentials/commands/Commandspawner.java

@@ -4,9 +4,9 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.LocationUtil;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.Locale;
 import org.bukkit.Location;
 import org.bukkit.Material;

Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java

@@ -1,8 +1,6 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.ITarget;
-import com.earth2me.essentials.PlayerTarget;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;

Essentials/src/com/earth2me/essentials/commands/Commandwarp.java

@@ -1,17 +1,17 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IUser;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import net.ess3.api.IUser;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.*;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.FormatUtil;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.IEssentialsModule;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.metrics;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Server;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java

@@ -1,6 +1,5 @@
 package com.earth2me.essentials.metrics;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.metrics.Metrics.Graph;
 import com.earth2me.essentials.metrics.Metrics.Plotter;
 import com.earth2me.essentials.register.payment.Method;
@@ -8,6 +7,7 @@ import com.earth2me.essentials.register.payment.methods.VaultEco;
 import com.earth2me.essentials.signs.EssentialsSign;
 import java.util.Locale;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.configuration.ConfigurationSection;
 
 

Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java

@@ -1,13 +1,13 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;

Essentials/src/com/earth2me/essentials/signs/SignBalance.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.signs;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.NumberUtil;
+import net.ess3.api.IEssentials;
 
 
 public class SignBalance extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.FormatUtil;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;

Essentials/src/com/earth2me/essentials/signs/SignBuy.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignBuy extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignDisposal.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignDisposal extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignEnchant.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
 import java.util.Locale;
+import net.ess3.api.IEssentials;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/com/earth2me/essentials/signs/SignFree.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.signs;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;

Essentials/src/com/earth2me/essentials/signs/SignGameMode.java

@@ -2,10 +2,10 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import java.util.Locale;
+import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 

Essentials/src/com/earth2me/essentials/signs/SignHeal.java

@@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignHeal extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignInfo.java

@@ -1,7 +1,6 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.textreader.IText;
@@ -9,6 +8,7 @@ import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.TextInput;
 import com.earth2me.essentials.textreader.TextPager;
 import java.io.IOException;
+import net.ess3.api.IEssentials;
 
 
 public class SignInfo extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignKit.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.NoChargeException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import net.ess3.api.IEssentials;
 
 
 public class SignKit extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignMail.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.signs;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import java.util.List;
+import net.ess3.api.IEssentials;
 
 
 public class SignMail extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;

Essentials/src/com/earth2me/essentials/signs/SignProtection.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.utils.FormatUtil;
 import java.util.*;
+import net.ess3.api.IEssentials;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

Essentials/src/com/earth2me/essentials/signs/SignRepair.java

@@ -2,11 +2,11 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.commands.Commandrepair;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import net.ess3.api.IEssentials;
 
 
 public class SignRepair extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignSell.java

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignSell extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.*;
 import java.util.List;
+import net.ess3.api.IEssentials;
 
 
 public class SignSpawnmob extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignTime.java

@@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignTime extends EssentialsSign

Essentials/src/com/earth2me/essentials/signs/SignTrade.java

@@ -1,13 +1,13 @@
 package com.earth2me.essentials.signs;
 
-import net.ess3.api.IEssentials;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade.TradeType;
 import com.earth2me.essentials.*;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade.OverflowType;
+import com.earth2me.essentials.Trade.TradeType;
 import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.Map;
+import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/com/earth2me/essentials/signs/SignWarp.java

@@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/com/earth2me/essentials/signs/SignWeather.java

@@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.IEssentials;
 
 
 public class SignWeather extends EssentialsSign

Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.storage;
 
-import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 

Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.storage;
 
-import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 

Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.storage;
 
 import com.earth2me.essentials.IConf;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IReload;
 import java.io.File;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IReload;
 import org.bukkit.Bukkit;
 
 

Essentials/src/com/earth2me/essentials/textreader/BookInput.java

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.textreader;
 
-import net.ess3.api.IEssentials;
 import java.io.*;
 import java.lang.ref.SoftReference;
 import java.util.*;
+import net.ess3.api.IEssentials;
 
 
 public class BookInput implements IText

Essentials/src/com/earth2me/essentials/textreader/HelpInput.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.textreader;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 

Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

@@ -1,8 +1,11 @@
 package com.earth2me.essentials.textreader;
 
 import com.earth2me.essentials.ExecuteTimer;
-import net.ess3.api.IEssentials;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.PlayerList;
 import com.earth2me.essentials.User;
+import static com.earth2me.essentials.textreader.KeywordType.DISPLAYNAME;
+import static com.earth2me.essentials.textreader.KeywordType.PLAYER;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.DescParseTickFormat;
 import com.earth2me.essentials.utils.NumberUtil;
@@ -10,25 +13,21 @@ import java.lang.management.ManagementFactory;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.PlayerList;
-import static com.earth2me.essentials.textreader.KeywordType.DISPLAYNAME;
-import static com.earth2me.essentials.textreader.KeywordType.PLAYER;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 
 public class KeywordReplacer implements IText
 {

Essentials/src/com/earth2me/essentials/textreader/TextInput.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.textreader;
 
-import net.ess3.api.IEssentials;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.FormatUtil;
 import com.earth2me.essentials.utils.StringUtil;
 import java.io.*;
 import java.lang.ref.SoftReference;
 import java.util.*;
+import net.ess3.api.IEssentials;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/com/earth2me/essentials/utils/FormatUtil.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.utils;
 
-import net.ess3.api.IUser;
 import java.util.regex.Pattern;
+import net.ess3.api.IUser;
 
 
 public class FormatUtil

Essentials/src/com/earth2me/essentials/utils/NumberUtil.java

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.utils;
 
 import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
+import net.ess3.api.IEssentials;
 
 
 public class NumberUtil

Essentials/test/com/earth2me/essentials/EconomyTest.java

@@ -2,9 +2,9 @@ package com.earth2me.essentials;
 
 import com.earth2me.essentials.api.NoLoanPermittedException;
 import com.earth2me.essentials.api.UserDoesNotExistException;
-import net.ess3.api.Economy;
 import java.io.IOException;
 import junit.framework.TestCase;
+import net.ess3.api.Economy;
 import org.bukkit.World.Environment;
 import org.bukkit.plugin.InvalidDescriptionException;
 import org.junit.Test;

Essentials/test/com/earth2me/essentials/FakeServer.java

@@ -1,13 +1,14 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import com.avaje.ebean.config.ServerConfig;
+import com.earth2me.essentials.OfflinePlayer;
 import com.earth2me.essentials.craftbukkit.FakeWorld;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.*;
 import org.bukkit.Warning.WarningState;
 import org.bukkit.World.Environment;
@@ -228,8 +229,7 @@ public class FakeServer implements Server
 			@Override
 			public void callEvent(Event event) throws IllegalStateException
 			{
-				Logger.getGlobal().info("Called event " + event.getEventName());
+				Logger.getLogger("Minecraft").info("Called event " + event.getEventName());
-				return;
 			}
 
 			@Override