Organize Imports

Essentials/src/net/ess3/api/IEssentials.java

@@ -7,7 +7,6 @@ import net.ess3.economy.register.Methods;
 import net.ess3.metrics.Metrics;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.plugin.Plugin;
 
 
 public interface IEssentials extends IComponent

Essentials/src/net/ess3/api/IUserMap.java

@@ -1,9 +1,9 @@
 package net.ess3.api;
 
-import net.ess3.user.TooManyMatchesException;
 import java.io.File;
 import java.util.Set;
 import net.ess3.user.PlayerNotFoundException;
+import net.ess3.user.TooManyMatchesException;
 import org.bukkit.entity.Player;
 
 

Essentials/src/net/ess3/backup/Backup.java

@@ -1,15 +1,15 @@
 package net.ess3.backup;
 
-import static net.ess3.I18n._;
-import net.ess3.api.IBackup;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import lombok.Cleanup;
+import static net.ess3.I18n._;
+import net.ess3.api.IBackup;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/bukkit/BukkitPlugin.java

@@ -7,7 +7,6 @@ import static net.ess3.I18n._;
 import net.ess3.api.IPlugin;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

Essentials/src/net/ess3/bukkit/VersionCheck.java

@@ -1,9 +1,9 @@
 package net.ess3.bukkit;
 
-import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import static net.ess3.I18n._;
 import org.bukkit.plugin.PluginManager;
 
 

Essentials/src/net/ess3/commands/Commandback.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 
 
 public class Commandback extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbalancetop.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.utils.Util;
-import net.ess3.api.IUser;
-import net.ess3.utils.textreader.ArrayListInput;
-import net.ess3.utils.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.utils.Util;
+import net.ess3.utils.textreader.ArrayListInput;
+import net.ess3.utils.textreader.TextPager;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandban.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import net.ess3.Console;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.Ban;
-import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandbanip.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
-import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandbigtree.java

@@ -3,7 +3,6 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.utils.LocationUtil;
-//TODO: remove bukkit
 import org.bukkit.Location;
 import org.bukkit.TreeType;
 

Essentials/src/net/ess3/commands/Commandburn.java

@@ -3,7 +3,6 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandburn extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandclearinventory.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
+import java.util.List;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commanddelhome.java

@@ -1,10 +1,11 @@
 package net.ess3.commands;
 
+import java.util.Locale;
+import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-import java.util.Locale;
+import org.bukkit.command.CommandSender;
-import lombok.Cleanup;
 
 
 public class Commanddelhome extends EssentialsCommand
@@ -18,7 +19,7 @@ public class Commanddelhome extends EssentialsCommand
 		}
 
 		@Cleanup
-		IUser user = sender instanceof Player ? ess.getUserMap().getUser((Player)sender) : null;
+		IUser user = sender instanceof IUser ? (IUser)sender : null;
 		String name;
 		String[] expandedArg;
 

Essentials/src/net/ess3/commands/Commanddeljail.java

@@ -1,7 +1,7 @@
 package net.ess3.commands;
 
-import net.ess3.api.server.CommandSender;
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 
 
 public class Commanddeljail extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanddelwarp.java

@@ -1,7 +1,7 @@
 package net.ess3.commands;
 
-import net.ess3.api.server.CommandSender;
 import static net.ess3.I18n._;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commanddelwarp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandeco.java

@@ -1,11 +1,10 @@
 package net.ess3.commands;
 
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import static net.ess3.I18n._;
-
 import java.util.Locale;
 import lombok.Cleanup;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
 

Essentials/src/net/ess3/commands/Commandenchant.java

@@ -1,10 +1,5 @@
 package net.ess3.commands;
 
-import net.ess3.bukkit.Enchantments;
-import static net.ess3.I18n._;
-import net.ess3.utils.Util;
-import net.ess3.api.IUser;
-import net.ess3.permissions.EnchantPermissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

Essentials/src/net/ess3/commands/Commandessentials.java

@@ -1,14 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-
-import net.ess3.api.server.Player;
 import java.util.HashMap;
 import java.util.Map;
+import static net.ess3.I18n._;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Location;
 import net.ess3.api.server.Material;
-//TODO: remove bukkit
+import net.ess3.api.server.Player;
 import org.bukkit.block.Block;
 
 

Essentials/src/net/ess3/commands/Commandexp.java

@@ -3,7 +3,6 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
-import net.ess3.api.server.Player;
 import net.ess3.craftbukkit.SetExpFix;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;

Essentials/src/net/ess3/commands/Commandfeed.java

@@ -1,6 +1,5 @@
 package net.ess3.commands;
 
-import java.util.List;
 import java.util.Set;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;

Essentials/src/net/ess3/commands/Commandfireball.java

@@ -1,7 +1,6 @@
 package net.ess3.commands;
 
 import net.ess3.api.IUser;
-//TODO: remove bukkit
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;

Essentials/src/net/ess3/commands/Commandgc.java

@@ -1,7 +1,6 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-//TODO - Remove bukkit refs
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.World;
 import org.bukkit.ChatColor;

Essentials/src/net/ess3/commands/Commandgive.java

@@ -9,7 +9,6 @@ import net.ess3.api.server.Material;
 import net.ess3.api.server.Player;
 import net.ess3.permissions.GivePermissions;
 import net.ess3.utils.Util;
-//TODO: remove bukkit imports
 import org.bukkit.ChatColor;
 import org.bukkit.enchantments.Enchantment;
 

Essentials/src/net/ess3/commands/Commandhat.java

@@ -5,8 +5,6 @@ import net.ess3.api.IUser;
 import net.ess3.api.server.ItemStack;
 import net.ess3.api.server.Material;
 import net.ess3.craftbukkit.InventoryWorkaround;
-//TODO: not sure if this is correct
-import net.ess3.api.server.IInventory;
 
 
 

Essentials/src/net/ess3/commands/Commandheal.java

@@ -1,6 +1,5 @@
 package net.ess3.commands;
 
-import java.util.List;
 import java.util.Set;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;

Essentials/src/net/ess3/commands/Commandhome.java

@@ -10,7 +10,6 @@ import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
 import net.ess3.utils.Util;
-//TODO: remove this
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandinvsee.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
+import java.util.Arrays;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
-import net.ess3.user.Inventory;
-import java.util.Arrays;
 import net.ess3.api.server.ItemStack;
+import net.ess3.user.Inventory;
 
 
 

Essentials/src/net/ess3/commands/Commanditem.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
+import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.Enchantment;
 import net.ess3.api.server.ItemStack;
 import net.ess3.permissions.ItemPermissions;
-import java.util.Locale;
 
 
 public class Commanditem extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandjump.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
-import net.ess3.api.server.ILocation; //shouldn't this be location?
+import net.ess3.api.server.ILocation;
 import net.ess3.api.server.Location;
+import net.ess3.economy.Trade;
 import net.ess3.utils.LocationUtil;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 

Essentials/src/net/ess3/commands/Commandkill.java

@@ -1,10 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
-//TODO: remove this
 import org.bukkit.event.entity.EntityDamageEvent;
 
 

Essentials/src/net/ess3/commands/Commandkillall.java

@@ -1,15 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-
-import net.ess3.bukkit.LivingEntities;
 import java.util.Collections;
 import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.World;
 import net.ess3.bukkit.LivingEntities;
-//TODO: remove these
 import org.bukkit.Chunk;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;

Essentials/src/net/ess3/commands/Commandkit.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.utils.Util;
-import net.ess3.api.IUser;
-import net.ess3.permissions.KitPermissions;
-import net.ess3.settings.Kit;
 import java.util.Collection;
 import java.util.Locale;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.KitPermissions;
+import net.ess3.settings.Kit;
+import net.ess3.utils.Util;
 
 
 public class Commandkit extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkittycannon.java

@@ -5,7 +5,6 @@ import java.util.Random;
 import net.ess3.api.IUser;
 import net.ess3.api.server.Location;
 import net.ess3.bukkit.LivingEntities;
-//TODO: remove this
 import org.bukkit.entity.Ocelot;
 
 

Essentials/src/net/ess3/commands/Commandlightning.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import lombok.Cleanup;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
-//TODO: remove this
+import net.ess3.permissions.Permissions;
 import org.bukkit.entity.LightningStrike;
 
 

Essentials/src/net/ess3/commands/Commandlist.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
+import java.util.*;
 import static net.ess3.I18n._;
-import net.ess3.utils.Util;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
-import java.util.*;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.Util;
 
 public class Commandlist extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandme.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.utils.Util;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import net.ess3.utils.Util;
 
 
 public class Commandme extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmore.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
+import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
 import net.ess3.permissions.ItemPermissions;
 import net.ess3.permissions.Permissions;
-import java.util.Locale;
-import net.ess3.api.server.ItemStack;
 
 
 public class Commandmore extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmsg.java

@@ -1,15 +1,15 @@
 package net.ess3.commands;
 
-import net.ess3.Console;
-import static net.ess3.I18n._;
-import net.ess3.utils.Util;
-import net.ess3.api.IReplyTo;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.api.IReplyTo;
+import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.Util;
 
 
 

Essentials/src/net/ess3/commands/Commandmute.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import static net.ess3.I18n._;
-
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import net.ess3.api.server.CommandSender;
-import lombok.Cleanup;
 
 public class Commandmute extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandpay.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
 import net.ess3.api.server.Player;
+import net.ess3.economy.Trade;
 
 
 

Essentials/src/net/ess3/commands/Commandping.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.utils.Util;
 import net.ess3.api.IUser;
+import net.ess3.utils.Util;
 
 
 public class Commandping extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandr.java

@@ -2,12 +2,12 @@ package net.ess3.commands;
 
 import net.ess3.Console;
 import static net.ess3.I18n._;
-import net.ess3.utils.Util;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
 import net.ess3.permissions.Permissions;
+import net.ess3.utils.Util;
 
 
 public class Commandr extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandremove.java

@@ -5,7 +5,6 @@ import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.World;
-//TODO: remove bukkit
 import org.bukkit.Chunk;
 import org.bukkit.entity.*;
 

Essentials/src/net/ess3/commands/Commandseen.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import static net.ess3.I18n._;
-
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import net.ess3.api.server.CommandSender;
-import lombok.Cleanup;
 
 public class Commandseen extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandspawn.java

@@ -7,7 +7,6 @@ import net.ess3.api.server.Location;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.settings.SpawnsHolder;
-//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandspawner.java

@@ -1,16 +1,15 @@
 package net.ess3.commands;
 
+import java.util.Locale;
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
+import net.ess3.api.server.Material;
 import net.ess3.bukkit.LivingEntities;
 import net.ess3.economy.Trade;
-import net.ess3.api.IUser;
 import net.ess3.permissions.SpawnerPermissions;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
-import java.util.Locale;
-import net.ess3.api.server.Location;
-import net.ess3.api.server.Material;
-//TODO: remove bukkit
 import org.bukkit.block.CreatureSpawner;
 
 

Essentials/src/net/ess3/commands/Commandspawnmob.java

@@ -15,8 +15,8 @@ import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
 import org.bukkit.DyeColor;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Villager.Profession;
 import org.bukkit.entity.*;
+import org.bukkit.entity.Villager.Profession;
 import org.bukkit.material.Colorable;
 //TODO - Bukkit cleanup
 

Essentials/src/net/ess3/commands/Commandtempban.java

@@ -2,7 +2,6 @@ package net.ess3.commands;
 
 import net.ess3.Console;
 import static net.ess3.I18n._;
-
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;

Essentials/src/net/ess3/commands/Commandtogglejail.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
+import lombok.Cleanup;
 import static net.ess3.I18n._;
-
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import lombok.Cleanup;
-import net.ess3.api.server.CommandSender;
 
 
 public class Commandtogglejail extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtop.java

@@ -1,10 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
 import net.ess3.api.server.Location;
-//TODO: remove bukkit
+import net.ess3.economy.Trade;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtp.java

@@ -9,7 +9,6 @@ import net.ess3.api.server.CommandSender;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
-//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtpaccept.java

@@ -1,11 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
-//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtpall.java

@@ -7,7 +7,6 @@ import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Player;
 import net.ess3.permissions.WorldPermissions;
-//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtphere.java

@@ -1,10 +1,9 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.api.IUser;
 import lombok.Cleanup;
-//TODO: remove bukkit
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtpo.java

@@ -3,7 +3,6 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 

Essentials/src/net/ess3/commands/Commandtpohere.java

@@ -6,7 +6,6 @@ import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
-//TODO: remove buikkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
@@ -42,7 +41,7 @@ public class Commandtpohere extends EssentialsCommand
 		// Verify permission
 		if (!player.isHidden() || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
 		{
-			player.getTeleport().now(user, false, TeleportCause.COMMAND);
+			player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND);
 			user.sendMessage(_("teleporting"));
 		}
 		else

Essentials/src/net/ess3/commands/Commandunlimited.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
+import java.util.Locale;
+import java.util.Set;
+import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.UnlimitedItemPermissions;
-import java.util.Locale;
-import java.util.Set;
-import lombok.Cleanup;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/net/ess3/commands/Commandwarp.java

@@ -1,16 +1,16 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.utils.Util;
-import net.ess3.api.IUser;
-import net.ess3.api.IWarps;
-import net.ess3.permissions.Permissions;
-import net.ess3.permissions.WarpPermissions;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.IWarps;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.Permissions;
+import net.ess3.permissions.WarpPermissions;
+import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 

Essentials/src/net/ess3/commands/Commandworld.java

@@ -1,11 +1,10 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.api.IUser;
-import net.ess3.permissions.WorldPermissions;
 import java.util.List;
-//TODO: remove bukkit
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.WorldPermissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

Essentials/src/net/ess3/commands/Commandworth.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.utils.Util;
-import net.ess3.api.IUser;
 import java.util.Locale;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/net/ess3/commands/EssentialsCommand.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
+import java.util.logging.Logger;
 import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IEssentialsModule;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.AbstractSuperpermsPermission;
-import java.util.logging.Logger;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/listener/EssentialsEntityListener.java

@@ -1,10 +1,5 @@
 package net.ess3.listener;
 
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
 import static net.ess3.I18n._;
@@ -21,8 +16,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.inventory.ItemStack;
 
 

Essentials/src/net/ess3/listener/EssentialsPlayerListener.java

@@ -29,8 +29,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.InventoryHolder;
 import org.bukkit.inventory.ItemStack;

Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java

@@ -1,8 +1,7 @@
 package net.ess3.permissions;
 
-import net.ess3.bukkit.PermissionFactory;
 import net.ess3.api.IPermission;
-import net.ess3.utils.Util;
+import net.ess3.bukkit.PermissionFactory;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

Essentials/src/net/ess3/permissions/KitPermissions.java

@@ -1,9 +1,9 @@
 package net.ess3.permissions;
 
-import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import net.ess3.api.IPermission;
 import org.bukkit.permissions.PermissionDefault;
 
 

Essentials/src/net/ess3/permissions/Permissions.java

@@ -1,8 +1,8 @@
 package net.ess3.permissions;
 
-import net.ess3.bukkit.PermissionFactory;
 import java.util.Locale;
 import net.ess3.api.IPermission;
+import net.ess3.bukkit.PermissionFactory;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

Essentials/src/net/ess3/permissions/WarpPermissions.java

@@ -1,9 +1,9 @@
 package net.ess3.permissions;
 
-import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import net.ess3.api.IPermission;
 import org.bukkit.permissions.PermissionDefault;
 
 

Essentials/src/net/ess3/settings/Warp.java

@@ -2,8 +2,8 @@ package net.ess3.settings;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.ess3.storage.StoredLocation;
 import net.ess3.storage.StorageObject;
+import net.ess3.storage.StoredLocation;
 
 @Data
 @EqualsAndHashCode(callSuper = false)

Essentials/src/net/ess3/settings/WorldOptions.java

@@ -1,9 +1,9 @@
 package net.ess3.settings;
 
-import net.ess3.storage.Comment;
-import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 
 @Data
 @EqualsAndHashCode(callSuper = false)

Essentials/src/net/ess3/settings/geoip/Database.java

@@ -1,8 +1,8 @@
 package net.ess3.settings.geoip;
 
-import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.ess3.storage.StorageObject;
 
 
 @Data

Essentials/src/net/ess3/settings/protect/Prevent.java

@@ -1,11 +1,10 @@
 package net.ess3.settings.protect;
 
-import net.ess3.storage.*;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.ess3.storage.*;
 import org.bukkit.Material;
 
 

Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java

@@ -6,7 +6,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
-import net.ess3.Essentials;
 import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 

Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java

@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
-import net.ess3.Essentials;
 import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 

Essentials/src/net/ess3/storage/BukkitConstructor.java

@@ -11,7 +11,6 @@ import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
-import org.bukkit.plugin.Plugin;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;

Essentials/src/net/ess3/user/User.java

@@ -1,13 +1,6 @@
 package net.ess3.user;
 
 import java.lang.ref.WeakReference;
-import static net.ess3.I18n._;
-import net.ess3.Teleport;
-import net.ess3.api.*;
-import net.ess3.economy.register.Method;
-import net.ess3.permissions.Permissions;
-import net.ess3.utils.DateUtil;
-import net.ess3.utils.Util;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -17,6 +10,13 @@ import lombok.Cleanup;
 import lombok.Getter;
 import lombok.Setter;
 import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.Teleport;
+import net.ess3.api.*;
+import net.ess3.economy.register.Method;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.DateUtil;
+import net.ess3.utils.Util;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/utils/Util.java

@@ -14,7 +14,6 @@ import net.ess3.api.IUser;
 import net.ess3.api.InvalidNameException;
 import net.ess3.utils.gnu.inet.encoding.Punycode;
 import net.ess3.utils.gnu.inet.encoding.PunycodeException;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;

Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java

@@ -1,14 +1,14 @@
 package net.ess3.utils.textreader;
 
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import net.ess3.utils.DescParseTickFormat;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import lombok.Cleanup;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.utils.DescParseTickFormat;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/test/net/ess3/FakeServer.java

@@ -6,8 +6,8 @@ import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
-import org.bukkit.World.Environment;
 import org.bukkit.*;
+import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.PluginCommand;

Essentials/test/net/ess3/UserTest.java

@@ -1,11 +1,6 @@
 package net.ess3;
 
-import java.io.IOException;
-import junit.framework.TestCase;
 import net.ess3.api.IUser;
-import net.ess3.user.User;
-import org.bukkit.World.Environment;
-import org.bukkit.plugin.InvalidDescriptionException;
 
 
 public class UserTest extends EssentialsTest

Essentials/test/net/ess3/UtilTest.java

@@ -1,13 +1,12 @@
 package net.ess3;
 
-import net.ess3.api.InvalidNameException;
-import net.ess3.utils.DateUtil;
-import net.ess3.utils.Util;
-
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.InvalidNameException;
+import net.ess3.utils.DateUtil;
+import net.ess3.utils.Util;
 
 
 public class UtilTest extends EssentialsTest

Essentials/test/net/ess3/testserver/TestPlayer.java

@@ -1,7 +1,6 @@
 package net.ess3.testserver;
 
 import net.ess3.api.IUser;
-import net.ess3.api.server.*;
 
 public class TestPlayer implements Player {