summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/net/ess3/api/Economy.java1
-rw-r--r--Essentials/src/net/ess3/bukkit/LivingEntities.java5
-rw-r--r--Essentials/src/net/ess3/commands/Commandbalance.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandbalancetop.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandbroadcast.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandhelpop.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandhome.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandme.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandpay.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandping.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandr.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandsell.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandwhois.java1
-rw-r--r--Essentials/src/net/ess3/commands/Commandworth.java1
-rw-r--r--Essentials/src/net/ess3/ranks/VaultGroups.java1
-rw-r--r--Essentials/src/net/ess3/settings/Settings.java1
-rw-r--r--Essentials/src/net/ess3/settings/SettingsHolder.java1
-rw-r--r--Essentials/src/net/ess3/settings/SpawnsHolder.java1
-rw-r--r--Essentials/src/net/ess3/settings/antibuild/BlackList.java1
-rw-r--r--Essentials/src/net/ess3/settings/protect/Prevent.java3
-rw-r--r--Essentials/src/net/ess3/user/UserMap.java1
-rw-r--r--EssentialsChat/src/net/ess3/chat/ChatPermissions.java4
-rw-r--r--EssentialsChat/src/net/ess3/chat/EssentialsChat.java10
-rw-r--r--EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java2
-rw-r--r--EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java2
-rw-r--r--EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java2
-rw-r--r--EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java2
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java4
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java2
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java10
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSign.java11
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignBalance.java1
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignEnchant.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignGameMode.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignKit.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignMail.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignTrade.java5
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignsPermissions.java3
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java1
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java3
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java10
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java1
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java3
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/UserManager.java2
-rw-r--r--EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java5
47 files changed, 44 insertions, 84 deletions
diff --git a/Essentials/src/net/ess3/api/Economy.java b/Essentials/src/net/ess3/api/Economy.java
index 8b02dbbf1..627c0c746 100644
--- a/Essentials/src/net/ess3/api/Economy.java
+++ b/Essentials/src/net/ess3/api/Economy.java
@@ -1,7 +1,6 @@
package net.ess3.api;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
/**
diff --git a/Essentials/src/net/ess3/bukkit/LivingEntities.java b/Essentials/src/net/ess3/bukkit/LivingEntities.java
index 96ca05ce5..ee52c158e 100644
--- a/Essentials/src/net/ess3/bukkit/LivingEntities.java
+++ b/Essentials/src/net/ess3/bukkit/LivingEntities.java
@@ -6,13 +6,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.Server;
import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
public class LivingEntities
diff --git a/Essentials/src/net/ess3/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java
index a7c89e63a..4b7b302e1 100644
--- a/Essentials/src/net/ess3/commands/Commandbalance.java
+++ b/Essentials/src/net/ess3/commands/Commandbalance.java
@@ -4,7 +4,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java
index f085846c2..5ba24db3c 100644
--- a/Essentials/src/net/ess3/commands/Commandbalancetop.java
+++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java
@@ -7,7 +7,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import net.ess3.utils.textreader.ArrayListInput;
import net.ess3.utils.textreader.TextPager;
import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/net/ess3/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java
index 4f01c11bb..87c21a674 100644
--- a/Essentials/src/net/ess3/commands/Commandbroadcast.java
+++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java
@@ -2,7 +2,6 @@ package net.ess3.commands;
import static net.ess3.I18n._;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java
index d3bb267fb..95fb30569 100644
--- a/Essentials/src/net/ess3/commands/Commandhelpop.java
+++ b/Essentials/src/net/ess3/commands/Commandhelpop.java
@@ -5,7 +5,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.entity.Player;
diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java
index 730ef1a19..247ecd2db 100644
--- a/Essentials/src/net/ess3/commands/Commandhome.java
+++ b/Essentials/src/net/ess3/commands/Commandhome.java
@@ -1,6 +1,5 @@
package net.ess3.commands;
-import java.util.List;
import java.util.Locale;
import java.util.Set;
import static net.ess3.I18n._;
diff --git a/Essentials/src/net/ess3/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java
index 59c28fdfe..7652dad24 100644
--- a/Essentials/src/net/ess3/commands/Commandme.java
+++ b/Essentials/src/net/ess3/commands/Commandme.java
@@ -4,7 +4,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
public class Commandme extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java
index 929f21387..9143d5fd8 100644
--- a/Essentials/src/net/ess3/commands/Commandpay.java
+++ b/Essentials/src/net/ess3/commands/Commandpay.java
@@ -3,7 +3,6 @@ package net.ess3.commands;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.economy.Trade;
-import org.bukkit.entity.Player;
diff --git a/Essentials/src/net/ess3/commands/Commandping.java b/Essentials/src/net/ess3/commands/Commandping.java
index cf247e8de..3e1a11301 100644
--- a/Essentials/src/net/ess3/commands/Commandping.java
+++ b/Essentials/src/net/ess3/commands/Commandping.java
@@ -3,7 +3,6 @@ package net.ess3.commands;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
public class Commandping extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java
index d080c696f..233f1aa9d 100644
--- a/Essentials/src/net/ess3/commands/Commandr.java
+++ b/Essentials/src/net/ess3/commands/Commandr.java
@@ -6,7 +6,6 @@ import net.ess3.api.IReplyTo;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index 06d759d90..9b13b0f37 100644
--- a/Essentials/src/net/ess3/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -7,7 +7,6 @@ import net.ess3.api.IUser;
import net.ess3.craftbukkit.InventoryWorkaround;
import net.ess3.economy.Trade;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java
index c6d314787..f93a047bd 100644
--- a/Essentials/src/net/ess3/commands/Commandwhois.java
+++ b/Essentials/src/net/ess3/commands/Commandwhois.java
@@ -9,7 +9,6 @@ import net.ess3.permissions.Permissions;
import net.ess3.user.UserData;
import net.ess3.utils.DateUtil;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java
index bfcb81d81..df3ba1901 100644
--- a/Essentials/src/net/ess3/commands/Commandworth.java
+++ b/Essentials/src/net/ess3/commands/Commandworth.java
@@ -4,7 +4,6 @@ import java.util.Locale;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.inventory.ItemStack;
diff --git a/Essentials/src/net/ess3/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java
index f8fd7ff2e..1f5788183 100644
--- a/Essentials/src/net/ess3/ranks/VaultGroups.java
+++ b/Essentials/src/net/ess3/ranks/VaultGroups.java
@@ -6,7 +6,6 @@ import net.ess3.api.IRanks;
import net.ess3.api.ISettings;
import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import net.milkbowl.vault.chat.Chat;
import org.bukkit.plugin.RegisteredServiceProvider;
diff --git a/Essentials/src/net/ess3/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java
index 967d4bc18..9ed3fd498 100644
--- a/Essentials/src/net/ess3/settings/Settings.java
+++ b/Essentials/src/net/ess3/settings/Settings.java
@@ -1,6 +1,5 @@
package net.ess3.settings;
-import java.util.HashMap;
import java.util.Map;
import lombok.AccessLevel;
import lombok.Data;
diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java
index 0f4746f49..b20b7ab22 100644
--- a/Essentials/src/net/ess3/settings/SettingsHolder.java
+++ b/Essentials/src/net/ess3/settings/SettingsHolder.java
@@ -1,7 +1,6 @@
package net.ess3.settings;
import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
import net.ess3.api.IEssentials;
import net.ess3.api.ISettings;
import net.ess3.storage.AsyncStorageObjectHolder;
diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java
index 8686ae46e..a1c7e88d3 100644
--- a/Essentials/src/net/ess3/settings/SpawnsHolder.java
+++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java
@@ -1,7 +1,6 @@
package net.ess3.settings;
import java.io.File;
-import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java
index 8c9b82f0b..109f1ec0d 100644
--- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java
+++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java
@@ -1,6 +1,5 @@
package net.ess3.settings.antibuild;
-import java.util.HashSet;
import java.util.Set;
import lombok.AccessLevel;
import lombok.Data;
diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java
index 6d48ad719..206b9626b 100644
--- a/Essentials/src/net/ess3/settings/protect/Prevent.java
+++ b/Essentials/src/net/ess3/settings/protect/Prevent.java
@@ -1,11 +1,8 @@
package net.ess3.settings.protect;
-import java.util.HashSet;
-import java.util.Set;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.ess3.storage.*;
-import org.bukkit.Material;
@Data
diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java
index 0217ff7bc..43ca9b2f8 100644
--- a/Essentials/src/net/ess3/user/UserMap.java
+++ b/Essentials/src/net/ess3/user/UserMap.java
@@ -11,7 +11,6 @@ import net.ess3.api.IUserMap;
import net.ess3.api.InvalidNameException;
import net.ess3.storage.StorageObjectMap;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
import org.bukkit.entity.Player;
diff --git a/EssentialsChat/src/net/ess3/chat/ChatPermissions.java b/EssentialsChat/src/net/ess3/chat/ChatPermissions.java
index 888b85f9d..a94fde1fd 100644
--- a/EssentialsChat/src/net/ess3/chat/ChatPermissions.java
+++ b/EssentialsChat/src/net/ess3/chat/ChatPermissions.java
@@ -1,10 +1,10 @@
package net.ess3.chat;
-import net.ess3.api.IPermission;
-import net.ess3.permissions.BasePermission;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import net.ess3.api.IPermission;
+import net.ess3.permissions.BasePermission;
public class ChatPermissions
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
index 66286a3af..f191e345e 100644
--- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
+++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java
@@ -1,15 +1,15 @@
package net.ess3.chat;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest;
-import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest;
-import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
import net.ess3.api.IPlugin;
+import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest;
+import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest;
+import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
index be4c5305c..b6b93c0bf 100644
--- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
@@ -3,8 +3,6 @@ package net.ess3.chat;
import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import java.util.logging.Logger;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
index 46dc2af82..dca0c3b79 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
@@ -1,9 +1,9 @@
package net.ess3.chat.listenerlevel;
+import java.util.Map;
import net.ess3.api.IEssentials;
import net.ess3.chat.ChatStore;
import net.ess3.chat.EssentialsChatPlayer;
-import java.util.Map;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
index 5c2fa1d7e..f5a8c26ab 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
@@ -1,10 +1,10 @@
package net.ess3.chat.listenerlevel;
+import java.util.Map;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import net.ess3.chat.ChatStore;
import net.ess3.chat.EssentialsChatPlayer;
-import java.util.Map;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
index 2e3b44549..201d946c5 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
@@ -1,9 +1,9 @@
package net.ess3.chat.listenerlevel;
+import java.util.Map;
import net.ess3.api.IEssentials;
import net.ess3.chat.ChatStore;
import net.ess3.chat.EssentialsChatPlayer;
-import java.util.Map;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
index 64c4c3206..e37523ed7 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
@@ -1,10 +1,10 @@
package net.ess3.geoip;
+import java.io.File;
+import java.io.IOException;
import net.ess3.api.IEssentials;
import net.ess3.settings.geoip.GeoIP;
import net.ess3.storage.AsyncStorageObjectHolder;
-import java.io.File;
-import java.io.IOException;
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
index 265a47947..fe3b68275 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java
@@ -1,8 +1,8 @@
package net.ess3.geoip;
+import java.util.logging.Level;
import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
-import java.util.logging.Level;
import net.ess3.api.IPlugin;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
index 5ccb5487a..e7b3fe85e 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
@@ -1,10 +1,5 @@
package net.ess3.geoip;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IReload;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
import com.maxmind.geoip.Location;
import com.maxmind.geoip.LookupService;
import com.maxmind.geoip.regionName;
@@ -16,6 +11,11 @@ import java.net.URLConnection;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IReload;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
index 1a229a8c8..60a76b9bd 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
@@ -1,15 +1,14 @@
package net.ess3.signs;
-import net.ess3.api.ChargeException;
-import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.utils.Util;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
+import static net.ess3.I18n._;
+import net.ess3.api.ChargeException;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
import net.ess3.utils.FormatUtil;
import org.bukkit.Material;
import org.bukkit.block.Block;
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
index 1b661e458..ae96be4f6 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
@@ -1,9 +1,9 @@
package net.ess3.signs;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
import net.ess3.api.IPlugin;
import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;
diff --git a/EssentialsSigns/src/net/ess3/signs/SignBalance.java b/EssentialsSigns/src/net/ess3/signs/SignBalance.java
index 81cac977a..2648e6aad 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignBalance.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignBalance.java
@@ -4,7 +4,6 @@ import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
public class SignBalance extends EssentialsSign
diff --git a/EssentialsSigns/src/net/ess3/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/SignEnchant.java
index 8369dd10e..492836eee 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignEnchant.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignEnchant.java
@@ -1,12 +1,12 @@
package net.ess3.signs;
+import java.util.Locale;
import static net.ess3.I18n._;
import net.ess3.api.ChargeException;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import net.ess3.bukkit.Enchantments;
import net.ess3.economy.Trade;
-import java.util.Locale;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
diff --git a/EssentialsSigns/src/net/ess3/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java
index 38acbc304..e8a8e5b79 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignGameMode.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java
@@ -1,11 +1,11 @@
package net.ess3.signs;
+import java.util.Locale;
import static net.ess3.I18n._;
import net.ess3.api.ChargeException;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import net.ess3.economy.Trade;
-import java.util.Locale;
import org.bukkit.GameMode;
diff --git a/EssentialsSigns/src/net/ess3/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/SignKit.java
index 8a783f684..413eed605 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignKit.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignKit.java
@@ -1,12 +1,12 @@
package net.ess3.signs;
+import java.util.Locale;
import net.ess3.api.ChargeException;
-import net.ess3.economy.Trade;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
import net.ess3.permissions.Permissions;
import net.ess3.settings.Kit;
-import java.util.Locale;
public class SignKit extends EssentialsSign
diff --git a/EssentialsSigns/src/net/ess3/signs/SignMail.java b/EssentialsSigns/src/net/ess3/signs/SignMail.java
index 5b1c810ac..b9f7de05c 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignMail.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignMail.java
@@ -1,9 +1,9 @@
package net.ess3.signs;
+import java.util.List;
import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
-import java.util.List;
public class SignMail extends EssentialsSign
diff --git a/EssentialsSigns/src/net/ess3/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/SignTrade.java
index d8a08982c..3038cc27c 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignTrade.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignTrade.java
@@ -1,11 +1,10 @@
package net.ess3.signs;
-import net.ess3.api.ChargeException;
import static net.ess3.I18n._;
-import net.ess3.economy.Trade;
-import net.ess3.utils.Util;
+import net.ess3.api.ChargeException;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
import net.ess3.utils.FormatUtil;
import org.bukkit.inventory.ItemStack;
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
index 49cf15647..0f74a965d 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
@@ -1,10 +1,10 @@
package net.ess3.signs;
-import net.ess3.api.IEssentials;
-import net.ess3.storage.AsyncStorageObjectHolder;
import java.io.File;
import java.io.IOException;
import java.util.*;
+import net.ess3.api.IEssentials;
+import net.ess3.storage.AsyncStorageObjectHolder;
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsPermissions.java b/EssentialsSigns/src/net/ess3/signs/SignsPermissions.java
index 2f45de72d..7070bbb88 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsPermissions.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsPermissions.java
@@ -2,9 +2,6 @@ package net.ess3.signs;
import net.ess3.api.IPermission;
import net.ess3.permissions.BasePermission;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
import net.ess3.permissions.DotStarPermission;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
index d48f60e7d..68609207d 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
@@ -4,7 +4,6 @@ import net.ess3.Console;
import net.ess3.commands.EssentialsCommand;
import net.ess3.commands.NotEnoughArgumentsException;
import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
public class Commandxmpp extends EssentialsCommand
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
index 2fee4bbfd..ca78962f6 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
@@ -1,9 +1,8 @@
package net.ess3.xmpp;
+import java.util.List;
import net.ess3.commands.EssentialsCommand;
import net.ess3.commands.NotEnoughArgumentsException;
-import java.util.List;
-
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
index 849aa4331..0aa6c9bed 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
@@ -1,15 +1,15 @@
package net.ess3.xmpp;
-import static net.ess3.I18n._;
-import net.ess3.api.ICommandHandler;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import net.ess3.commands.EssentialsCommandHandler;
import java.util.List;
import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.ICommandHandler;
+import net.ess3.api.IEssentials;
import net.ess3.api.IPlugin;
+import net.ess3.api.IUser;
+import net.ess3.commands.EssentialsCommandHandler;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.PluginManager;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
index 4824f03db..1e63e4e2a 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
@@ -1,7 +1,6 @@
package net.ess3.xmpp;
import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
index 14fea2c78..789ccddc9 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
@@ -1,9 +1,8 @@
package net.ess3.xmpp;
-import net.ess3.api.IUser;
import java.util.List;
+import net.ess3.api.IUser;
import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
index a2018c006..c80680445 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
@@ -1,11 +1,11 @@
package net.ess3.xmpp;
-import net.ess3.api.IReload;
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.IReload;
import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
index 1348ef734..bf88aad8b 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
@@ -1,14 +1,13 @@
package net.ess3.xmpp;
-import net.ess3.api.IReload;
-import net.ess3.api.IUser;
-import net.ess3.utils.Util;
import java.io.File;
import java.util.*;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import net.ess3.api.IReload;
+import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;