Organize Imports

2025-08-24 15:23:20 +02:00 · 2012-01-04 03:45:26 +00:00
parent a5398e938c
commit d2bbbd14fc
49 changed files with 52 additions and 99 deletions
--- a/Essentials/src/com/earth2me/essentials/Backup.java
+++ b/Essentials/src/com/earth2me/essentials/Backup.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.IBackup;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IBackup;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import java.io.BufferedReader;
--- a/Essentials/src/com/earth2me/essentials/Console.java
+++ b/Essentials/src/com/earth2me/essentials/Console.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.api.IReplyTo;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import com.earth2me.essentials.api.IReplyTo;


 public final class Console implements IReplyTo
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -1,10 +1,10 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.craftbukkit.FakeWorld;
 import com.earth2me.essentials.settings.Spawns;
 import com.earth2me.essentials.storage.YamlStorageWriter;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
--- a/Essentials/src/com/earth2me/essentials/ItemDb.java
+++ b/Essentials/src/com/earth2me/essentials/ItemDb.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.IItemDb;
-import com.earth2me.essentials.api.IEssentials;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IItemDb;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
--- a/Essentials/src/com/earth2me/essentials/Jails.java
+++ b/Essentials/src/com/earth2me/essentials/Jails.java
@@ -1,10 +1,10 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.IJails;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IJails;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
@@ -14,7 +14,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event.Type;
-import org.bukkit.event.block.*;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockListener;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
--- a/Essentials/src/com/earth2me/essentials/Kits.java
+++ b/Essentials/src/com/earth2me/essentials/Kits.java
@@ -1,11 +1,11 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IKits;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.settings.Kit;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -1,17 +1,15 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ITeleport;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import com.earth2me.essentials.user.CooldownException;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
-import lombok.Cleanup;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
--- a/Essentials/src/com/earth2me/essentials/Trade.java
+++ b/Essentials/src/com/earth2me/essentials/Trade.java
@@ -1,11 +1,11 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.api.IUser;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
-import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -9,7 +9,6 @@ import com.earth2me.essentials.external.gnu.inet.encoding.PunycodeException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
--- a/Essentials/src/com/earth2me/essentials/api/Economy.java
+++ b/Essentials/src/com/earth2me/essentials/api/Economy.java
@@ -1,7 +1,5 @@
 package com.earth2me.essentials.api;

-import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer;
 import com.earth2me.essentials.user.User;
--- a/Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java
@@ -1,7 +1,6 @@
 package com.earth2me.essentials.api;

 import java.util.Map;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.Plugin;


--- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
@@ -4,8 +4,6 @@ import com.earth2me.essentials.listener.TNTExplodeListener;
 import com.earth2me.essentials.perm.IPermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
 import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;

--- a/Essentials/src/com/earth2me/essentials/api/IKits.java
+++ b/Essentials/src/com/earth2me/essentials/api/IKits.java
@@ -2,8 +2,6 @@ package com.earth2me.essentials.api;

 import com.earth2me.essentials.settings.Kit;
 import java.util.Collection;
-import java.util.List;
-import org.bukkit.Location;


 public interface IKits extends IReload
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
@@ -5,7 +5,6 @@ import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;


 public class Commandbalance extends EssentialsCommand
--- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
@@ -2,9 +2,12 @@ package com.earth2me.essentials.commands;

 import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
-import java.util.*;
+import com.earth2me.essentials.api.IUser;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;

--- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.*;
 import org.bukkit.command.CommandSender;

--- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
@@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

--- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
@@ -1,25 +1,13 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.Mob;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.ComplexLivingEntity;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Flying;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.NPC;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Snowman;
-import org.bukkit.entity.WaterMob;
-import org.bukkit.entity.Wolf;
+import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;


--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Kits;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.settings.Kit;
-import java.util.*;
+import java.util.Collection;
+import java.util.Locale;


 public class Commandkit extends EssentialsCommand
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.api.ISettings;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -1,7 +1,9 @@
 package com.earth2me.essentials.commands;

+import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.*;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
 import java.util.ArrayList;
 import java.util.List;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import org.bukkit.command.CommandSender;

--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -2,10 +2,8 @@ package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.ISettings;
-import java.util.Locale;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.CreatureSpawner;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -3,12 +3,11 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Mob.MobException;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
 import java.util.Random;
-import lombok.Cleanup;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
@@ -2,9 +2,8 @@ package com.earth2me.essentials.commands;

 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.OfflinePlayer;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.user.Ban;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -1,9 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.OfflinePlayer;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import lombok.Cleanup;
 import org.bukkit.OfflinePlayer;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
@@ -1,7 +1,6 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.OfflinePlayer;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
@@ -1,7 +1,6 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.OfflinePlayer;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.TreeType;

--- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
@@ -1,12 +1,11 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
 import lombok.Cleanup;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

--- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
+++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
@@ -13,7 +13,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;


 public abstract class EssentialsCommand extends AbstractSuperpermsPermission implements IEssentialsCommand
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java
@@ -1,6 +1,5 @@
 package com.earth2me.essentials.craftbukkit;

-import com.earth2me.essentials.craftbukkit.FakeInventory;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/OfflineBedLocation.java
@@ -7,7 +7,6 @@ import net.minecraft.server.NBTTagCompound;
 import net.minecraft.server.WorldNBTStorage;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;


 public class OfflineBedLocation
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.listener;

+import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.Util;
 import org.bukkit.GameMode;
 import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.BlockPlaceEvent;
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
@@ -1,9 +1,9 @@
 package com.earth2me.essentials.listener;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import static com.earth2me.essentials.I18n._;
 import java.util.List;
 import lombok.Cleanup;
 import org.bukkit.Material;
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
@@ -1,10 +1,10 @@
 package com.earth2me.essentials.listener;

-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.Util;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.SetBed;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
@@ -26,7 +26,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.ItemStack;

--- a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java
+++ b/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java
@@ -4,7 +4,6 @@ import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IWarp;
 import com.earth2me.essentials.api.InvalidNameException;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.StorageObject;
 import java.io.File;
 import java.io.IOException;

--- a/Essentials/src/com/earth2me/essentials/settings/Worlds.java
+++ b/Essentials/src/com/earth2me/essentials/settings/Worlds.java
@@ -1,9 +1,6 @@
 package com.earth2me.essentials.settings;

-import com.earth2me.essentials.storage.MapValueType;
 import com.earth2me.essentials.storage.StorageObject;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

--- a/Essentials/src/com/earth2me/essentials/settings/Worth.java
+++ b/Essentials/src/com/earth2me/essentials/settings/Worth.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.material.MaterialData;


--- a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
+++ b/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
@@ -1,10 +1,6 @@
 package com.earth2me.essentials.settings.protect;

-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.ListType;
-import com.earth2me.essentials.storage.MapKeyType;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import com.earth2me.essentials.storage.*;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
+++ b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;

--- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java
+++ b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java
@@ -1,12 +1,9 @@
 package com.earth2me.essentials.storage;

-import java.beans.IntrospectionException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
--- a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/TextInput.java
@@ -1,17 +1,15 @@
 package com.earth2me.essentials.textreader;

+import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.InvalidNameException;
 import java.io.*;
 import java.util.*;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import sun.util.BuddhistCalendar;


 public class TextInput implements IText
--- a/Essentials/src/com/earth2me/essentials/user/Inventory.java
+++ b/Essentials/src/com/earth2me/essentials/user/Inventory.java
@@ -7,7 +7,6 @@ import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;


--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -5,7 +5,6 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Teleport;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.register.payment.Method;
 import java.util.Calendar;
@@ -13,7 +12,6 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import lombok.Cleanup;
 import lombok.Getter;
--- a/Essentials/src/com/earth2me/essentials/user/UserBase.java
+++ b/Essentials/src/com/earth2me/essentials/user/UserBase.java
@@ -9,8 +9,6 @@ import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import lombok.Cleanup;
 import lombok.Delegate;
 import org.bukkit.Bukkit;