From e5a8cd88f02a252e016e0e54526fe8fe03c44cc8 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 18 Nov 2011 17:42:26 +0000 Subject: Code cleanup continued. --- Essentials/nbproject/project.properties | 2 ++ .../essentials/AlternativeCommandsHandler.java | 6 +----- Essentials/src/com/earth2me/essentials/Backup.java | 1 - .../earth2me/essentials/DescParseTickFormat.java | 1 - .../src/com/earth2me/essentials/Essentials.java | 25 +++++++++++++++------- .../com/earth2me/essentials/EssentialsConf.java | 8 +------ .../essentials/EssentialsEntityListener.java | 10 +-------- .../essentials/EssentialsPlayerListener.java | 15 +------------ .../com/earth2me/essentials/EssentialsUpgrade.java | 16 ++------------ .../src/com/earth2me/essentials/FakeWorld.java | 17 ++------------- Essentials/src/com/earth2me/essentials/I18n.java | 6 +----- .../earth2me/essentials/JailPlayerListener.java | 6 +----- .../src/com/earth2me/essentials/ManagedFile.java | 11 +--------- .../src/com/earth2me/essentials/OfflinePlayer.java | 18 ++-------------- .../com/earth2me/essentials/PlayerExtension.java | 2 +- .../src/com/earth2me/essentials/Settings.java | 6 +++--- .../src/com/earth2me/essentials/TargetBlock.java | 2 +- .../src/com/earth2me/essentials/UserData.java | 1 - Essentials/src/com/earth2me/essentials/Util.java | 18 ++-------------- Essentials/src/com/earth2me/essentials/Warps.java | 7 +----- .../earth2me/essentials/commands/Commandafk.java | 2 +- .../essentials/commands/Commandantioch.java | 5 ++--- .../essentials/commands/Commandbalance.java | 2 +- .../essentials/commands/Commandbalancetop.java | 11 +++------- .../earth2me/essentials/commands/Commandban.java | 4 ++-- .../essentials/commands/Commandbigtree.java | 4 ++-- .../essentials/commands/Commandbroadcast.java | 1 - .../essentials/commands/Commandclearinventory.java | 6 +++--- .../essentials/commands/Commandcompass.java | 2 +- .../essentials/commands/Commanddelhome.java | 2 +- .../essentials/commands/Commanddelwarp.java | 2 +- .../earth2me/essentials/commands/Commanddepth.java | 2 +- .../earth2me/essentials/commands/Commandeco.java | 2 +- .../earth2me/essentials/commands/Commandext.java | 2 +- .../essentials/commands/Commandgetpos.java | 2 +- .../earth2me/essentials/commands/Commandgive.java | 4 ++-- .../earth2me/essentials/commands/Commandheal.java | 6 +++--- .../earth2me/essentials/commands/Commandhelp.java | 8 +++---- .../essentials/commands/Commandhelpop.java | 4 ++-- .../earth2me/essentials/commands/Commandhome.java | 2 +- .../earth2me/essentials/commands/Commanditem.java | 2 +- .../earth2me/essentials/commands/Commandjump.java | 6 +++--- .../earth2me/essentials/commands/Commandkick.java | 4 ++-- .../earth2me/essentials/commands/Commandkit.java | 8 ++----- .../earth2me/essentials/commands/Commandlist.java | 13 ++++------- .../earth2me/essentials/commands/Commandmail.java | 4 ++-- .../earth2me/essentials/commands/Commandme.java | 2 +- .../earth2me/essentials/commands/Commandmotd.java | 4 ++-- .../earth2me/essentials/commands/Commandmsg.java | 6 +++--- .../earth2me/essentials/commands/Commandmute.java | 4 ++-- .../earth2me/essentials/commands/Commandnick.java | 4 ++-- .../earth2me/essentials/commands/Commandpay.java | 4 ++-- .../earth2me/essentials/commands/Commandping.java | 2 +- .../earth2me/essentials/commands/Commandptime.java | 11 +++------- .../com/earth2me/essentials/commands/Commandr.java | 2 +- .../essentials/commands/Commandrealname.java | 6 +++--- .../essentials/commands/Commandrepair.java | 6 +----- .../earth2me/essentials/commands/Commandrules.java | 1 - .../earth2me/essentials/commands/Commandsell.java | 2 +- .../essentials/commands/Commandsethome.java | 2 +- .../essentials/commands/Commandsetjail.java | 2 +- .../essentials/commands/Commandsetwarp.java | 4 ++-- .../essentials/commands/Commandsetworth.java | 2 +- .../essentials/commands/Commandspawnmob.java | 12 ++++------- .../essentials/commands/Commandsuicide.java | 2 +- .../essentials/commands/Commandtempban.java | 4 ++-- .../earth2me/essentials/commands/Commandtime.java | 6 +++--- .../essentials/commands/Commandtogglejail.java | 4 ++-- .../earth2me/essentials/commands/Commandtop.java | 4 ++-- .../earth2me/essentials/commands/Commandtp.java | 4 ++-- .../earth2me/essentials/commands/Commandtpa.java | 2 +- .../essentials/commands/Commandtpaall.java | 2 +- .../essentials/commands/Commandtpaccept.java | 2 +- .../essentials/commands/Commandtpahere.java | 2 +- .../earth2me/essentials/commands/Commandtpall.java | 2 +- .../essentials/commands/Commandtpdeny.java | 2 +- .../essentials/commands/Commandtphere.java | 2 +- .../earth2me/essentials/commands/Commandtpo.java | 2 +- .../essentials/commands/Commandtpohere.java | 2 +- .../earth2me/essentials/commands/Commandtppos.java | 4 ++-- .../essentials/commands/Commandtptoggle.java | 2 +- .../earth2me/essentials/commands/Commandtree.java | 4 ++-- .../earth2me/essentials/commands/Commandwarp.java | 2 +- .../earth2me/essentials/commands/Commandwhois.java | 6 +++--- .../earth2me/essentials/commands/Commandworld.java | 4 ++-- .../earth2me/essentials/commands/Commandworth.java | 4 ++-- .../essentials/commands/EssentialsCommand.java | 9 ++------ .../essentials/commands/IEssentialsCommand.java | 2 +- .../essentials/perm/BPermissionsHandler.java | 2 +- .../essentials/perm/GroupManagerHandler.java | 6 +++--- .../essentials/register/payment/Methods.java | 2 +- .../essentials/register/payment/methods/BOSE6.java | 2 +- .../essentials/register/payment/methods/BOSE7.java | 2 +- .../essentials/register/payment/methods/MCUR.java | 4 ++-- .../essentials/register/payment/methods/iCo4.java | 4 ++-- .../essentials/register/payment/methods/iCo5.java | 4 ++-- .../essentials/register/payment/methods/iCo6.java | 4 ++-- .../com/earth2me/essentials/settings/Commands.java | 8 +------ .../earth2me/essentials/signs/EssentialsSign.java | 6 +----- .../essentials/signs/SignBlockListener.java | 9 +------- .../src/com/earth2me/essentials/signs/SignBuy.java | 2 +- .../essentials/signs/SignEntityListener.java | 1 - .../com/earth2me/essentials/signs/SignFree.java | 6 +----- .../earth2me/essentials/signs/SignGameMode.java | 6 +----- .../com/earth2me/essentials/signs/SignHeal.java | 6 +----- .../earth2me/essentials/signs/SignProtection.java | 6 +----- .../com/earth2me/essentials/signs/SignSell.java | 2 +- .../com/earth2me/essentials/signs/SignTime.java | 6 +----- .../com/earth2me/essentials/signs/SignTrade.java | 6 +----- .../com/earth2me/essentials/signs/SignWarp.java | 2 +- .../com/earth2me/essentials/signs/SignWeather.java | 6 +----- .../com/earth2me/essentials/storage/Comment.java | 6 +----- .../earth2me/essentials/storage/StorageObject.java | 9 +------- .../earth2me/essentials/textreader/TextInput.java | 9 +------- 114 files changed, 186 insertions(+), 383 deletions(-) diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index 079cf2b0c..8e7ea3314 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -29,6 +29,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blank auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*;static * auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE @@ -37,6 +38,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.place auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateStaticImports=true auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java index 4ee78220e..1ec545b69 100644 --- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java +++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java @@ -1,10 +1,6 @@ package com.earth2me.essentials; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.PluginCommand; diff --git a/Essentials/src/com/earth2me/essentials/Backup.java b/Essentials/src/com/earth2me/essentials/Backup.java index 02a3d54ba..a7a0f2de3 100644 --- a/Essentials/src/com/earth2me/essentials/Backup.java +++ b/Essentials/src/com/earth2me/essentials/Backup.java @@ -7,7 +7,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.CraftServer; public class Backup implements Runnable diff --git a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java index 0fd2e9047..acdfbb291 100644 --- a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java +++ b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java @@ -1,6 +1,5 @@ package com.earth2me.essentials; -import com.earth2me.essentials.commands.Commandtime; import java.text.SimpleDateFormat; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 2babd6f3c..6ab23e8fb 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -19,12 +19,6 @@ package com.earth2me.essentials; import com.earth2me.essentials.api.Economy; import com.earth2me.essentials.commands.EssentialsCommand; -import java.io.*; -import java.util.*; -import java.util.logging.*; -import org.bukkit.*; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.commands.NotEnoughArgumentsException; @@ -33,14 +27,29 @@ import com.earth2me.essentials.register.payment.Methods; import com.earth2me.essentials.signs.SignBlockListener; import com.earth2me.essentials.signs.SignEntityListener; import com.earth2me.essentials.signs.SignPlayerListener; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Type; -import org.bukkit.plugin.*; -import org.bukkit.plugin.java.*; +import org.bukkit.plugin.InvalidDescriptionException; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index c48f9f987..c7266ada7 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -1,12 +1,6 @@ package com.earth2me.essentials; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index fed7a2956..f1bcd34f2 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -1,19 +1,11 @@ package com.earth2me.essentials; import java.util.List; -import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityCombustEvent; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.event.entity.EntityListener; -import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; -import org.bukkit.event.entity.FoodLevelChangeEvent; -import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.entity.*; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 2ad673822..b35056c94 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -15,21 +15,8 @@ import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.block.Action; -import org.bukkit.event.player.PlayerAnimationEvent; -import org.bukkit.event.player.PlayerAnimationType; -import org.bukkit.event.player.PlayerBucketEmptyEvent; -import org.bukkit.event.player.PlayerChatEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerEggThrowEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerListener; -import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerLoginEvent.Result; -import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.*; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java index 2f8f7512e..9127ec61b 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -1,22 +1,10 @@ package com.earth2me.essentials; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; +import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; diff --git a/Essentials/src/com/earth2me/essentials/FakeWorld.java b/Essentials/src/com/earth2me/essentials/FakeWorld.java index 0b5d68be1..a5dc222ac 100644 --- a/Essentials/src/com/earth2me/essentials/FakeWorld.java +++ b/Essentials/src/com/earth2me/essentials/FakeWorld.java @@ -2,23 +2,10 @@ package com.earth2me.essentials; import java.util.List; import java.util.UUID; -import org.bukkit.BlockChangeDelegate; -import org.bukkit.Chunk; -import org.bukkit.ChunkSnapshot; -import org.bukkit.Difficulty; -import org.bukkit.Effect; -import org.bukkit.Location; -import org.bukkit.TreeType; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.Block; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.CreatureType; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Item; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java index 5f1dd7ec3..bef8764b1 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/com/earth2me/essentials/I18n.java @@ -7,11 +7,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.text.MessageFormat; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import java.util.*; import java.util.logging.Level; import org.bukkit.Bukkit; diff --git a/Essentials/src/com/earth2me/essentials/JailPlayerListener.java b/Essentials/src/com/earth2me/essentials/JailPlayerListener.java index da8c165cb..c801780fe 100644 --- a/Essentials/src/com/earth2me/essentials/JailPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/JailPlayerListener.java @@ -2,11 +2,7 @@ package com.earth2me.essentials; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerListener; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.*; public class JailPlayerListener extends PlayerListener diff --git a/Essentials/src/com/earth2me/essentials/ManagedFile.java b/Essentials/src/com/earth2me/essentials/ManagedFile.java index 759261e02..673d8d835 100644 --- a/Essentials/src/com/earth2me/essentials/ManagedFile.java +++ b/Essentials/src/com/earth2me/essentials/ManagedFile.java @@ -1,15 +1,6 @@ package com.earth2me.essentials; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; +import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; import java.security.DigestOutputStream; diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 8e50aa1bd..ccdb4595d 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -6,23 +6,9 @@ import java.util.List; import java.util.Set; import java.util.UUID; import lombok.Delegate; -import org.bukkit.Achievement; -import org.bukkit.Effect; -import org.bukkit.GameMode; -import org.bukkit.Instrument; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Note; -import org.bukkit.Server; -import org.bukkit.Statistic; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Block; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Egg; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.entity.Snowball; -import org.bukkit.entity.Vehicle; +import org.bukkit.entity.*; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/Essentials/src/com/earth2me/essentials/PlayerExtension.java b/Essentials/src/com/earth2me/essentials/PlayerExtension.java index 11c17761c..aef0aeebb 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerExtension.java +++ b/Essentials/src/com/earth2me/essentials/PlayerExtension.java @@ -1,11 +1,11 @@ package com.earth2me.essentials; import lombok.Delegate; -import org.bukkit.craftbukkit.entity.CraftPlayer; import net.minecraft.server.EntityPlayer; import net.minecraft.server.IInventory; import org.bukkit.command.CommandSender; import org.bukkit.configuration.serialization.ConfigurationSerializable; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.HumanEntity; diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index c19314e24..7e5b1b06f 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -1,13 +1,13 @@ package com.earth2me.essentials; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.bukkit.ChatColor; import com.earth2me.essentials.commands.IEssentialsCommand; import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.bukkit.ChatColor; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/TargetBlock.java b/Essentials/src/com/earth2me/essentials/TargetBlock.java index 3d45afc55..fb6bfabb6 100644 --- a/Essentials/src/com/earth2me/essentials/TargetBlock.java +++ b/Essentials/src/com/earth2me/essentials/TargetBlock.java @@ -1,9 +1,9 @@ package com.earth2me.essentials; import java.util.List; -import org.bukkit.block.Block; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index dcf67bfc8..dbfe34f27 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -1,6 +1,5 @@ package com.earth2me.essentials; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java index 067c8115f..a710b6240 100644 --- a/Essentials/src/com/earth2me/essentials/Util.java +++ b/Essentials/src/com/earth2me/essentials/Util.java @@ -1,25 +1,12 @@ package com.earth2me.essentials; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.MessageFormat; -import java.util.Calendar; -import java.util.Enumeration; -import java.util.GregorianCalendar; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; @@ -29,7 +16,6 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; public class Util diff --git a/Essentials/src/com/earth2me/essentials/Warps.java b/Essentials/src/com/earth2me/essentials/Warps.java index adf665f2a..85240d607 100644 --- a/Essentials/src/com/earth2me/essentials/Warps.java +++ b/Essentials/src/com/earth2me/essentials/Warps.java @@ -1,12 +1,7 @@ package com.earth2me.essentials; import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index 8bf70873d..42ad38e50 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandafk extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java index 57d5a9c75..54277d466 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java @@ -1,10 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Location; -import org.bukkit.Server; import com.earth2me.essentials.User; -import com.earth2me.essentials.TargetBlock; import com.earth2me.essentials.Util; +import org.bukkit.Location; +import org.bukkit.Server; import org.bukkit.entity.TNTPrimed; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java index e1ad11f9f..988ec6b7f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java index 159e16a59..ab1397c2e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java @@ -1,15 +1,10 @@ package com.earth2me.essentials.commands; -import java.util.Map.Entry; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.Map.Entry; +import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index 38e7d7c3f..2091ac4cd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -2,10 +2,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Console; import com.earth2me.essentials.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java index cd45e73c3..f1dc4c7b4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.TreeType; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import org.bukkit.Location; +import org.bukkit.Server; +import org.bukkit.TreeType; public class Commandbigtree extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java index 8587c31c1..258741ad4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandbroadcast extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java index 52c8afd48..a60f8960f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.List; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandclearinventory extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java b/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java index 6cff8fa71..31cfea6a0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandcompass extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java index 558964da7..a213c4f0e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import com.earth2me.essentials.Util; public class Commanddelhome extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java index ea5ef2613..115637827 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import com.earth2me.essentials.Util; public class Commanddelwarp extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java b/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java index c23e05fc7..f6de7c674 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commanddepth extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java index d20474540..f4a653ce3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.User; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.earth2me.essentials.User; public class Commandeco extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandext.java b/Essentials/src/com/earth2me/essentials/commands/Commandext.java index fd35df530..44a464430 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandext.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandext.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java b/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java index b8616e75f..b79df021c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.User; import org.bukkit.Location; import org.bukkit.Server; -import com.earth2me.essentials.User; public class Commandgetpos extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java index 32dbb9c70..0bf45d900 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import org.bukkit.ChatColor; import org.bukkit.Material; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java index f805eacc3..89962b01d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.List; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandheal extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java index 36e2fc223..5ea0c3c85 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java @@ -1,21 +1,21 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; +import java.util.logging.Level; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; -import java.util.Map.Entry; -import java.util.logging.Level; public class Commandhelp extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java index 51309e40f..2f92f07d3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.logging.Level; +import org.bukkit.Server; +import org.bukkit.entity.Player; public class Commandhelpop extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index e3bc88c0f..e6bbddbd4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.List; +import org.bukkit.Server; public class Commandhome extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java index 3d10ae198..35b3c09ae 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import org.bukkit.Material; +import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java index b7627f4bf..41648a14f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; -import org.bukkit.Location; -import org.bukkit.Server; import com.earth2me.essentials.TargetBlock; +import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Location; +import org.bukkit.Server; public class Commandjump extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java index 039badc80..5e54424aa 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Console; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java index 32f578244..31515b1e7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java @@ -1,15 +1,11 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import java.util.Calendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.util.GregorianCalendar; +import java.util.*; import org.bukkit.Material; +import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java index 24e6c2098..feb92719d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java @@ -1,17 +1,12 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.bukkit.ChatColor; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandlist extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index d7baa5bc6..3914c5a5d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; -import java.util.List; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import java.util.List; import org.bukkit.ChatColor; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java index 779e78420..10f542e4a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandme extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java b/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java index 9439d2ca2..5d2d6994a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java @@ -14,9 +14,9 @@ public class Commandmotd extends EssentialsCommand { super("motd"); } - + @Override - public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception + public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception { final IText input = new TextInput(sender, "motd", true, ess); final IText output = new KeywordReplacer(input, sender, ess); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java index f14935648..5042af458 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java @@ -1,13 +1,13 @@ package com.earth2me.essentials.commands; -import java.util.List; -import org.bukkit.Server; -import org.bukkit.entity.Player; import com.earth2me.essentials.Console; import com.earth2me.essentials.IReplyTo; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import java.util.List; +import org.bukkit.Server; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandmsg extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 6e2049e1b..002bac7fb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; public class Commandmute extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index 534547e34..e3e9d0b67 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; public class Commandnick extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java index 9be844996..8359da67a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.entity.Player; public class Commandpay extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandping.java b/Essentials/src/com/earth2me/essentials/commands/Commandping.java index 1f4cdd3dc..de11adb7b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandping.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandping.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandping extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java index 115bb20ef..8a68430b0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java @@ -1,17 +1,12 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.DescParseTickFormat; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; +import org.bukkit.Server; import org.bukkit.World; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index daf83034a..6a864ce35 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.Console; import com.earth2me.essentials.IReplyTo; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import org.bukkit.*; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java b/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java index 5ed4ef9e6..291c5b93d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import org.bukkit.ChatColor; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandrealname extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java index 26882ded4..9bbcd790d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IUser; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import java.util.ArrayList; import java.util.List; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java b/Essentials/src/com/earth2me/essentials/commands/Commandrules.java index e8f2d23d2..32cadf69e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrules.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Util; import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.TextInput; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java index a8ef83dc0..e28ae8dd1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java @@ -1,12 +1,12 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.InventoryWorkaround; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.logging.Level; import org.bukkit.Material; +import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java index b59984f05..77b18aa31 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandsethome extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java index d9b0eac4d..aeac10d4b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandsetjail extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java index ccdacab57..1c8cb2caa 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Location; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Location; +import org.bukkit.Server; public class Commandsetwarp extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java index 086b1549d..a8889fc09 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index 3ea3aae40..db98550e5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -1,20 +1,16 @@ package com.earth2me.essentials.commands; -import org.bukkit.Location; -import org.bukkit.Server; -import com.earth2me.essentials.User; import com.earth2me.essentials.Mob; import com.earth2me.essentials.Mob.MobException; import com.earth2me.essentials.TargetBlock; +import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.Random; import org.bukkit.DyeColor; +import org.bukkit.Location; +import org.bukkit.Server; import org.bukkit.block.Block; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Sheep; -import org.bukkit.entity.Slime; -import org.bukkit.entity.Wolf; +import org.bukkit.entity.*; public class Commandspawnmob extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java index e98a613ff..5db36161e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandsuicide extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java index bc8442da4..4c877fe77 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java @@ -2,10 +2,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Console; import com.earth2me.essentials.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java index 687396f53..a10e8c63c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java @@ -1,12 +1,12 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.DescParseTickFormat; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.*; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.command.CommandSender; public class Commandtime extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java index 625a375d8..f7cacb9f5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java index ee5bfbe45..7967b72de 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import org.bukkit.Location; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Location; +import org.bukkit.Server; public class Commandtop extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java index 480fb6153..a92bcdf97 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.Console; -import org.bukkit.Server; +import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java index 32cbe3bd9..786b08629 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpa extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java index 97897852f..dd5696f00 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index fd9eeaa84..350640087 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -2,9 +2,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.Trade; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpaccept extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java index 935721345..d121094a8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpahere extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java index 1cb6321ea..b03c2d931 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java index 5d7764ae6..9ec54cd9b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpdeny extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java index bba8d8743..2d618b6d5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtphere extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java index 5a4e082e0..540982e7f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.OfflinePlayer; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpo extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java index 7af39854f..15a016aee 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.OfflinePlayer; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtpohere extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java index ce7c369e4..55517b9f7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import org.bukkit.Location; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Location; +import org.bukkit.Server; public class Commandtppos extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java b/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java index f880c5d34..ad9b4231b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; +import org.bukkit.Server; public class Commandtptoggle extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java index 26bc9a8ee..a7bd6d549 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.TreeType; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; public class Commandtree extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java index 9b8ab28f3..b791d0c55 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java @@ -1,13 +1,13 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; -import org.bukkit.Server; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import com.earth2me.essentials.Warps; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 008f8ac00..d437682ee 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import org.bukkit.ChatColor; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandwhois extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java index 557f46dbf..ba742188e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java @@ -1,12 +1,12 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Trade; +import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import java.util.List; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; public class Commandworld extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java index 2a7e107bc..0d6ee0e6f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; -import org.bukkit.Server; + import com.earth2me.essentials.User; import com.earth2me.essentials.Util; - +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java index 58da18c21..9040827c4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java @@ -1,17 +1,12 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; +import com.earth2me.essentials.*; import java.util.List; +import java.util.logging.Logger; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.OfflinePlayer; import org.bukkit.entity.Player; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; -import java.util.logging.Logger; public abstract class EssentialsCommand implements IEssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java index a5192ba10..870797453 100644 --- a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java @@ -2,9 +2,9 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; +import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.Server; public interface IEssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java index b30a7c0c7..232cb04b4 100644 --- a/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.perm; import de.bananaco.permissions.Permissions; +import de.bananaco.permissions.info.InfoReader; import de.bananaco.permissions.interfaces.PermissionSet; import de.bananaco.permissions.worlds.WorldPermissionsManager; -import de.bananaco.permissions.info.InfoReader; import java.util.List; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java index 20b3806e0..d9da43ae8 100644 --- a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java @@ -1,12 +1,12 @@ package com.earth2me.essentials.perm; + import java.util.Arrays; import java.util.List; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; - import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; public class GroupManagerHandler implements IPermissionsHandler diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java b/Essentials/src/com/earth2me/essentials/register/payment/Methods.java index 34acf9837..dc9a23e13 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/Methods.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.register.payment; + import java.util.HashSet; import java.util.Set; - import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java index bc3893d5e..503b9dc9b 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import com.earth2me.essentials.register.payment.Method; import cosine.boseconomy.BOSEconomy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java index 72d1f763e..9004c8a0f 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import com.earth2me.essentials.register.payment.Method; import cosine.boseconomy.BOSEconomy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java index 53d8ed120..60fae7c2a 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; + +import com.earth2me.essentials.register.payment.Method; import me.ashtheking.currency.Currency; import me.ashtheking.currency.CurrencyList; - import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java index 1f33df12c..05b04af1c 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.register.payment.methods; + + import com.earth2me.essentials.register.payment.Method; import com.nijiko.coelho.iConomy.iConomy; import com.nijiko.coelho.iConomy.system.Account; - - import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java index d56873c3f..4a9ac8c62 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java @@ -1,13 +1,13 @@ package com.earth2me.essentials.register.payment.methods; + + import com.earth2me.essentials.register.payment.Method; import com.iConomy.iConomy; import com.iConomy.system.Account; import com.iConomy.system.BankAccount; import com.iConomy.system.Holdings; import com.iConomy.util.Constants; - - import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java index 1feee30af..5114dfc65 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java @@ -1,12 +1,12 @@ package com.earth2me.essentials.register.payment.methods; + + import com.earth2me.essentials.register.payment.Method; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; import com.iCo6.system.Holdings; - - import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/settings/Commands.java b/Essentials/src/com/earth2me/essentials/settings/Commands.java index 771cef12b..64a218476 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Commands.java +++ b/Essentials/src/com/earth2me/essentials/settings/Commands.java @@ -1,12 +1,6 @@ package com.earth2me.essentials.settings; -import com.earth2me.essentials.settings.commands.Afk; -import com.earth2me.essentials.settings.commands.God; -import com.earth2me.essentials.settings.commands.Help; -import com.earth2me.essentials.settings.commands.Home; -import com.earth2me.essentials.settings.commands.Kit; -import com.earth2me.essentials.settings.commands.Lightning; -import com.earth2me.essentials.settings.commands.Spawnmob; +import com.earth2me.essentials.settings.commands.*; import com.earth2me.essentials.storage.Comment; import com.earth2me.essentials.storage.ListType; import com.earth2me.essentials.storage.StorageObject; diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java index b9d224cec..6bd203e20 100644 --- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import java.util.HashSet; import java.util.Set; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java index 7320f27a4..2840df298 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -8,14 +8,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockIgniteEvent; -import org.bukkit.event.block.BlockListener; -import org.bukkit.event.block.BlockPistonExtendEvent; -import org.bukkit.event.block.BlockPistonRetractEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.block.SignChangeEvent; +import org.bukkit.event.block.*; public class SignBlockListener extends BlockListener diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/com/earth2me/essentials/signs/SignBuy.java index 39704ff0d..b99f92b65 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java index 4f6736989..eee813c7b 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java @@ -4,7 +4,6 @@ import com.earth2me.essentials.IEssentials; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.entity.EndermanPickupEvent; -import org.bukkit.event.entity.EndermanPlaceEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityListener; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignFree.java b/Essentials/src/com/earth2me/essentials/signs/SignFree.java index 8a7c27fe7..56efffb65 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignFree.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignFree.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.InventoryWorkaround; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import net.minecraft.server.InventoryPlayer; import org.bukkit.Material; import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java index a3b8cd275..f8fdeb20d 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import org.bukkit.GameMode; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java index cc932c5e2..a1c80e268 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; public class SignHeal extends EssentialsSign diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java index ced8443a6..856831b58 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/com/earth2me/essentials/signs/SignSell.java index 2a5a8cfcc..442a503c2 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignSell.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignSell.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTime.java b/Essentials/src/com/earth2me/essentials/signs/SignTime.java index 120347467..054ffde0c 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTime.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTime.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; public class SignTime extends EssentialsSign diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java index 6c956165a..cb9c08b2b 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java index 4aa4af11f..bd56be46e 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java b/Essentials/src/com/earth2me/essentials/signs/SignWeather.java index 05496ac14..8af788961 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignWeather.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; +import com.earth2me.essentials.*; public class SignWeather extends EssentialsSign diff --git a/Essentials/src/com/earth2me/essentials/storage/Comment.java b/Essentials/src/com/earth2me/essentials/storage/Comment.java index b43cec980..8cb9d4d31 100644 --- a/Essentials/src/com/earth2me/essentials/storage/Comment.java +++ b/Essentials/src/com/earth2me/essentials/storage/Comment.java @@ -1,10 +1,6 @@ package com.earth2me.essentials.storage; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; @Target(ElementType.FIELD) diff --git a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java b/Essentials/src/com/earth2me/essentials/storage/StorageObject.java index a35338516..cd144f424 100644 --- a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java +++ b/Essentials/src/com/earth2me/essentials/storage/StorageObject.java @@ -4,21 +4,14 @@ import java.io.PrintWriter; import java.io.Reader; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; import java.util.Map.Entry; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.composer.Composer; import org.yaml.snakeyaml.constructor.Constructor; -import org.yaml.snakeyaml.introspector.PropertyUtils; public class StorageObject diff --git a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java b/Essentials/src/com/earth2me/essentials/textreader/TextInput.java index bc2230c03..ac9d23e0d 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java +++ b/Essentials/src/com/earth2me/essentials/textreader/TextInput.java @@ -3,14 +3,7 @@ package com.earth2me.essentials.textreader; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -- cgit v1.2.3