From b98021acabcb4075c9455fd565697c69b0ba4b64 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 26 Aug 2012 17:15:35 +0200 Subject: Organize Imports --- Essentials/src/net/ess3/api/IEssentials.java | 1 - Essentials/src/net/ess3/api/IUserMap.java | 2 +- Essentials/src/net/ess3/backup/Backup.java | 8 ++++---- Essentials/src/net/ess3/bukkit/BukkitPlugin.java | 1 - Essentials/src/net/ess3/bukkit/VersionCheck.java | 2 +- Essentials/src/net/ess3/commands/Commandback.java | 2 +- Essentials/src/net/ess3/commands/Commandbalancetop.java | 10 +++++----- Essentials/src/net/ess3/commands/Commandban.java | 2 +- Essentials/src/net/ess3/commands/Commandbanip.java | 2 +- Essentials/src/net/ess3/commands/Commandbigtree.java | 1 - Essentials/src/net/ess3/commands/Commandburn.java | 1 - .../src/net/ess3/commands/Commandclearinventory.java | 2 +- Essentials/src/net/ess3/commands/Commanddelhome.java | 7 ++++--- Essentials/src/net/ess3/commands/Commanddeljail.java | 2 +- Essentials/src/net/ess3/commands/Commanddelwarp.java | 2 +- Essentials/src/net/ess3/commands/Commandeco.java | 7 +++---- Essentials/src/net/ess3/commands/Commandenchant.java | 5 ----- Essentials/src/net/ess3/commands/Commandessentials.java | 6 ++---- Essentials/src/net/ess3/commands/Commandexp.java | 1 - Essentials/src/net/ess3/commands/Commandfeed.java | 1 - Essentials/src/net/ess3/commands/Commandfireball.java | 1 - Essentials/src/net/ess3/commands/Commandgc.java | 1 - Essentials/src/net/ess3/commands/Commandgive.java | 1 - Essentials/src/net/ess3/commands/Commandhat.java | 2 -- Essentials/src/net/ess3/commands/Commandheal.java | 1 - Essentials/src/net/ess3/commands/Commandhome.java | 1 - Essentials/src/net/ess3/commands/Commandinvsee.java | 4 ++-- Essentials/src/net/ess3/commands/Commanditem.java | 2 +- Essentials/src/net/ess3/commands/Commandjump.java | 4 ++-- Essentials/src/net/ess3/commands/Commandkill.java | 2 -- Essentials/src/net/ess3/commands/Commandkillall.java | 4 ---- Essentials/src/net/ess3/commands/Commandkit.java | 8 ++++---- Essentials/src/net/ess3/commands/Commandkittycannon.java | 1 - Essentials/src/net/ess3/commands/Commandlightning.java | 5 ++--- Essentials/src/net/ess3/commands/Commandlist.java | 6 +++--- Essentials/src/net/ess3/commands/Commandme.java | 2 +- Essentials/src/net/ess3/commands/Commandmore.java | 4 ++-- Essentials/src/net/ess3/commands/Commandmsg.java | 8 ++++---- Essentials/src/net/ess3/commands/Commandmute.java | 5 ++--- Essentials/src/net/ess3/commands/Commandpay.java | 2 +- Essentials/src/net/ess3/commands/Commandping.java | 2 +- Essentials/src/net/ess3/commands/Commandr.java | 2 +- Essentials/src/net/ess3/commands/Commandremove.java | 1 - Essentials/src/net/ess3/commands/Commandseen.java | 5 ++--- Essentials/src/net/ess3/commands/Commandspawn.java | 1 - Essentials/src/net/ess3/commands/Commandspawner.java | 9 ++++----- Essentials/src/net/ess3/commands/Commandspawnmob.java | 2 +- Essentials/src/net/ess3/commands/Commandtempban.java | 1 - Essentials/src/net/ess3/commands/Commandtogglejail.java | 5 ++--- Essentials/src/net/ess3/commands/Commandtop.java | 3 +-- Essentials/src/net/ess3/commands/Commandtp.java | 1 - Essentials/src/net/ess3/commands/Commandtpaccept.java | 3 +-- Essentials/src/net/ess3/commands/Commandtpall.java | 1 - Essentials/src/net/ess3/commands/Commandtphere.java | 5 ++--- Essentials/src/net/ess3/commands/Commandtpo.java | 1 - Essentials/src/net/ess3/commands/Commandtpohere.java | 3 +-- Essentials/src/net/ess3/commands/Commandunlimited.java | 6 +++--- Essentials/src/net/ess3/commands/Commandwarp.java | 12 ++++++------ Essentials/src/net/ess3/commands/Commandworld.java | 5 ++--- Essentials/src/net/ess3/commands/Commandworth.java | 4 ++-- Essentials/src/net/ess3/commands/EssentialsCommand.java | 2 +- .../src/net/ess3/listener/EssentialsEntityListener.java | 7 +------ .../src/net/ess3/listener/EssentialsPlayerListener.java | 2 +- .../net/ess3/permissions/AbstractSuperpermsPermission.java | 3 +-- Essentials/src/net/ess3/permissions/KitPermissions.java | 2 +- Essentials/src/net/ess3/permissions/Permissions.java | 2 +- Essentials/src/net/ess3/permissions/WarpPermissions.java | 2 +- Essentials/src/net/ess3/settings/Warp.java | 2 +- Essentials/src/net/ess3/settings/WorldOptions.java | 4 ++-- Essentials/src/net/ess3/settings/geoip/Database.java | 2 +- Essentials/src/net/ess3/settings/protect/Prevent.java | 3 +-- .../net/ess3/storage/AbstractDelayedYamlFileReader.java | 1 - .../net/ess3/storage/AbstractDelayedYamlFileWriter.java | 1 - Essentials/src/net/ess3/storage/BukkitConstructor.java | 1 - Essentials/src/net/ess3/user/User.java | 14 +++++++------- Essentials/src/net/ess3/utils/Util.java | 1 - .../src/net/ess3/utils/textreader/KeywordReplacer.java | 6 +++--- Essentials/test/net/ess3/FakeServer.java | 2 +- Essentials/test/net/ess3/UserTest.java | 5 ----- Essentials/test/net/ess3/UtilTest.java | 7 +++---- Essentials/test/net/ess3/testserver/TestPlayer.java | 1 - 81 files changed, 105 insertions(+), 166 deletions(-) diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 741e56a5f..efdfa7649 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -7,7 +7,6 @@ import net.ess3.economy.register.Methods; import net.ess3.metrics.Metrics; import org.bukkit.Server; import org.bukkit.World; -import org.bukkit.plugin.Plugin; public interface IEssentials extends IComponent diff --git a/Essentials/src/net/ess3/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java index c87dd5e5e..63c7970fc 100644 --- a/Essentials/src/net/ess3/api/IUserMap.java +++ b/Essentials/src/net/ess3/api/IUserMap.java @@ -1,9 +1,9 @@ package net.ess3.api; -import net.ess3.user.TooManyMatchesException; import java.io.File; import java.util.Set; import net.ess3.user.PlayerNotFoundException; +import net.ess3.user.TooManyMatchesException; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index 806f2e618..adb24e924 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -1,15 +1,15 @@ package net.ess3.backup; -import static net.ess3.I18n._; -import net.ess3.api.IBackup; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.IBackup; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java index 34af338d0..82ef16c38 100644 --- a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java +++ b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java @@ -7,7 +7,6 @@ import static net.ess3.I18n._; import net.ess3.api.IPlugin; import org.bukkit.Location; import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/net/ess3/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java index 0413e15ba..10573a2d3 100644 --- a/Essentials/src/net/ess3/bukkit/VersionCheck.java +++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java @@ -1,9 +1,9 @@ package net.ess3.bukkit; -import static net.ess3.I18n._; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static net.ess3.I18n._; import org.bukkit.plugin.PluginManager; diff --git a/Essentials/src/net/ess3/commands/Commandback.java b/Essentials/src/net/ess3/commands/Commandback.java index 58537fa11..3fa5e6bbe 100644 --- a/Essentials/src/net/ess3/commands/Commandback.java +++ b/Essentials/src/net/ess3/commands/Commandback.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class Commandback extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index e97e3b514..2a9b5cd60 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import net.ess3.utils.Util; -import net.ess3.api.IUser; -import net.ess3.utils.textreader.ArrayListInput; -import net.ess3.utils.textreader.TextPager; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.locks.ReentrantReadWriteLock; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; +import net.ess3.utils.textreader.ArrayListInput; +import net.ess3.utils.textreader.TextPager; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java index 91db02db8..f244fecaa 100644 --- a/Essentials/src/net/ess3/commands/Commandban.java +++ b/Essentials/src/net/ess3/commands/Commandban.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import lombok.Cleanup; import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; -import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index e773d3a29..ff9eca5fe 100644 --- a/Essentials/src/net/ess3/commands/Commandbanip.java +++ b/Essentials/src/net/ess3/commands/Commandbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java index fe41b8f96..f02714438 100644 --- a/Essentials/src/net/ess3/commands/Commandbigtree.java +++ b/Essentials/src/net/ess3/commands/Commandbigtree.java @@ -3,7 +3,6 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.utils.LocationUtil; -//TODO: remove bukkit import org.bukkit.Location; import org.bukkit.TreeType; diff --git a/Essentials/src/net/ess3/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java index 0e2470d56..512399739 100644 --- a/Essentials/src/net/ess3/commands/Commandburn.java +++ b/Essentials/src/net/ess3/commands/Commandburn.java @@ -3,7 +3,6 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandburn extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index deee8b623..f7740c96c 100644 --- a/Essentials/src/net/ess3/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 334404349..7cb078537 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -1,10 +1,11 @@ package net.ess3.commands; +import java.util.Locale; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import java.util.Locale; -import lombok.Cleanup; +import org.bukkit.command.CommandSender; public class Commanddelhome extends EssentialsCommand @@ -18,7 +19,7 @@ public class Commanddelhome extends EssentialsCommand } @Cleanup - IUser user = sender instanceof Player ? ess.getUserMap().getUser((Player)sender) : null; + IUser user = sender instanceof IUser ? (IUser)sender : null; String name; String[] expandedArg; diff --git a/Essentials/src/net/ess3/commands/Commanddeljail.java b/Essentials/src/net/ess3/commands/Commanddeljail.java index bfbf9ebcb..4aa7c479e 100644 --- a/Essentials/src/net/ess3/commands/Commanddeljail.java +++ b/Essentials/src/net/ess3/commands/Commanddeljail.java @@ -1,7 +1,7 @@ package net.ess3.commands; -import net.ess3.api.server.CommandSender; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; public class Commanddeljail extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanddelwarp.java b/Essentials/src/net/ess3/commands/Commanddelwarp.java index 30a8d12a4..356f7d369 100644 --- a/Essentials/src/net/ess3/commands/Commanddelwarp.java +++ b/Essentials/src/net/ess3/commands/Commanddelwarp.java @@ -1,7 +1,7 @@ package net.ess3.commands; -import net.ess3.api.server.CommandSender; import static net.ess3.I18n._; +import net.ess3.api.server.CommandSender; public class Commanddelwarp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index b82ac04e7..3ea5a62f7 100644 --- a/Essentials/src/net/ess3/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -1,11 +1,10 @@ package net.ess3.commands; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import static net.ess3.I18n._; - import java.util.Locale; import lombok.Cleanup; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index c84acdb66..1d56f39d4 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -1,10 +1,5 @@ package net.ess3.commands; -import net.ess3.bukkit.Enchantments; -import static net.ess3.I18n._; -import net.ess3.utils.Util; -import net.ess3.api.IUser; -import net.ess3.permissions.EnchantPermissions; import java.util.Locale; import java.util.Map; import java.util.Set; diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index ac62cef7a..087efde06 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -1,14 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; - -import net.ess3.api.server.Player; import java.util.HashMap; import java.util.Map; +import static net.ess3.I18n._; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Location; import net.ess3.api.server.Material; -//TODO: remove bukkit +import net.ess3.api.server.Player; import org.bukkit.block.Block; diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java index 0150126b7..464eea275 100644 --- a/Essentials/src/net/ess3/commands/Commandexp.java +++ b/Essentials/src/net/ess3/commands/Commandexp.java @@ -3,7 +3,6 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.craftbukkit.SetExpFix; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java index 0f8867ae4..ed7136377 100644 --- a/Essentials/src/net/ess3/commands/Commandfeed.java +++ b/Essentials/src/net/ess3/commands/Commandfeed.java @@ -1,6 +1,5 @@ package net.ess3.commands; -import java.util.List; import java.util.Set; import static net.ess3.I18n._; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java index 8f4c0a536..8882f0106 100644 --- a/Essentials/src/net/ess3/commands/Commandfireball.java +++ b/Essentials/src/net/ess3/commands/Commandfireball.java @@ -1,7 +1,6 @@ package net.ess3.commands; import net.ess3.api.IUser; -//TODO: remove bukkit import org.bukkit.entity.Fireball; import org.bukkit.entity.SmallFireball; import org.bukkit.util.Vector; diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java index 9eb45af65..4d23cd5a4 100644 --- a/Essentials/src/net/ess3/commands/Commandgc.java +++ b/Essentials/src/net/ess3/commands/Commandgc.java @@ -1,7 +1,6 @@ package net.ess3.commands; import static net.ess3.I18n._; -//TODO - Remove bukkit refs import net.ess3.api.server.CommandSender; import net.ess3.api.server.World; import org.bukkit.ChatColor; diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index 6cbc178f3..9b4fde8df 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -9,7 +9,6 @@ import net.ess3.api.server.Material; import net.ess3.api.server.Player; import net.ess3.permissions.GivePermissions; import net.ess3.utils.Util; -//TODO: remove bukkit imports import org.bukkit.ChatColor; import org.bukkit.enchantments.Enchantment; diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java index 68aeb92f4..3f02df535 100644 --- a/Essentials/src/net/ess3/commands/Commandhat.java +++ b/Essentials/src/net/ess3/commands/Commandhat.java @@ -5,8 +5,6 @@ import net.ess3.api.IUser; import net.ess3.api.server.ItemStack; import net.ess3.api.server.Material; import net.ess3.craftbukkit.InventoryWorkaround; -//TODO: not sure if this is correct -import net.ess3.api.server.IInventory; diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java index 946583a19..8da5d89b6 100644 --- a/Essentials/src/net/ess3/commands/Commandheal.java +++ b/Essentials/src/net/ess3/commands/Commandheal.java @@ -1,6 +1,5 @@ package net.ess3.commands; -import java.util.List; import java.util.Set; import static net.ess3.I18n._; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index afcac8979..275c21916 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -10,7 +10,6 @@ import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; import net.ess3.utils.Util; -//TODO: remove this import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java index 41f031cef..d0c1226d5 100644 --- a/Essentials/src/net/ess3/commands/Commandinvsee.java +++ b/Essentials/src/net/ess3/commands/Commandinvsee.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import java.util.Arrays; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.user.Inventory; -import java.util.Arrays; import net.ess3.api.server.ItemStack; +import net.ess3.user.Inventory; diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index 132e1d4aa..cdaa3bfd5 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.server.Enchantment; import net.ess3.api.server.ItemStack; import net.ess3.permissions.ItemPermissions; -import java.util.Locale; public class Commanditem extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java index 542d5cdbe..01d597f5c 100644 --- a/Essentials/src/net/ess3/commands/Commandjump.java +++ b/Essentials/src/net/ess3/commands/Commandjump.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; -import net.ess3.api.server.ILocation; //shouldn't this be location? +import net.ess3.api.server.ILocation; import net.ess3.api.server.Location; +import net.ess3.economy.Trade; import net.ess3.utils.LocationUtil; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 1b1ed1055..7875616f1 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -1,10 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; - import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; -//TODO: remove this import org.bukkit.event.entity.EntityDamageEvent; diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java index dc43e2071..81f3c13d9 100644 --- a/Essentials/src/net/ess3/commands/Commandkillall.java +++ b/Essentials/src/net/ess3/commands/Commandkillall.java @@ -1,15 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; - -import net.ess3.bukkit.LivingEntities; import java.util.Collections; import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.server.CommandSender; import net.ess3.api.server.World; import net.ess3.bukkit.LivingEntities; -//TODO: remove these import org.bukkit.Chunk; import org.bukkit.entity.*; import org.bukkit.event.entity.EntityDeathEvent; diff --git a/Essentials/src/net/ess3/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java index f3ea78ce1..7ba4264fe 100644 --- a/Essentials/src/net/ess3/commands/Commandkit.java +++ b/Essentials/src/net/ess3/commands/Commandkit.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.Collection; +import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.economy.Trade; -import net.ess3.utils.Util; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.KitPermissions; import net.ess3.settings.Kit; -import java.util.Collection; -import java.util.Locale; +import net.ess3.utils.Util; public class Commandkit extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkittycannon.java b/Essentials/src/net/ess3/commands/Commandkittycannon.java index 1443b228f..6b521b3c9 100644 --- a/Essentials/src/net/ess3/commands/Commandkittycannon.java +++ b/Essentials/src/net/ess3/commands/Commandkittycannon.java @@ -5,7 +5,6 @@ import java.util.Random; import net.ess3.api.IUser; import net.ess3.api.server.Location; import net.ess3.bukkit.LivingEntities; -//TODO: remove this import org.bukkit.entity.Ocelot; diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java index fd7d62db4..ea2101a8d 100644 --- a/Essentials/src/net/ess3/commands/Commandlightning.java +++ b/Essentials/src/net/ess3/commands/Commandlightning.java @@ -1,13 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import lombok.Cleanup; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; -//TODO: remove this +import net.ess3.permissions.Permissions; import org.bukkit.entity.LightningStrike; diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index b8fc52738..738d2479e 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import java.util.*; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; -import java.util.*; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Commandlist extends EssentialsCommand { diff --git a/Essentials/src/net/ess3/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java index fb62ec234..1c6666d2b 100644 --- a/Essentials/src/net/ess3/commands/Commandme.java +++ b/Essentials/src/net/ess3/commands/Commandme.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Commandme extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index 450e644e4..e991593ed 100644 --- a/Essentials/src/net/ess3/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; +import net.ess3.api.server.ItemStack; import net.ess3.permissions.ItemPermissions; import net.ess3.permissions.Permissions; -import java.util.Locale; -import net.ess3.api.server.ItemStack; public class Commandmore extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index ce29ed5b9..4c3cce72c 100644 --- a/Essentials/src/net/ess3/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -1,15 +1,15 @@ package net.ess3.commands; +import java.util.List; +import lombok.Cleanup; import net.ess3.Console; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import java.util.List; -import lombok.Cleanup; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index fe3ae21b5..5c97e2df8 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,13 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; +import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import net.ess3.api.server.CommandSender; -import lombok.Cleanup; public class Commandmute extends EssentialsCommand { diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java index a4f2e0682..e54d28568 100644 --- a/Essentials/src/net/ess3/commands/Commandpay.java +++ b/Essentials/src/net/ess3/commands/Commandpay.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; import net.ess3.api.server.Player; +import net.ess3.economy.Trade; diff --git a/Essentials/src/net/ess3/commands/Commandping.java b/Essentials/src/net/ess3/commands/Commandping.java index 1aebfa971..13e99b912 100644 --- a/Essentials/src/net/ess3/commands/Commandping.java +++ b/Essentials/src/net/ess3/commands/Commandping.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; +import net.ess3.utils.Util; public class Commandping extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index 1e0b5750e..d7fab0592 100644 --- a/Essentials/src/net/ess3/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -2,12 +2,12 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Commandr extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index 8aa2f28de..50f02c4f4 100644 --- a/Essentials/src/net/ess3/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -5,7 +5,6 @@ import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; import net.ess3.api.server.World; -//TODO: remove bukkit import org.bukkit.Chunk; import org.bukkit.entity.*; diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index 9dbb6a7f9..092afe9ed 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,13 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; +import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import net.ess3.api.server.CommandSender; -import lombok.Cleanup; public class Commandseen extends EssentialsCommand { diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index bb177ae79..88b6af2c1 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -7,7 +7,6 @@ import net.ess3.api.server.Location; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.settings.SpawnsHolder; -//TODO: remove bukkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 7b5acaf43..52b37adb7 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -1,16 +1,15 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.api.server.Location; +import net.ess3.api.server.Material; import net.ess3.bukkit.LivingEntities; import net.ess3.economy.Trade; -import net.ess3.api.IUser; import net.ess3.permissions.SpawnerPermissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; -import java.util.Locale; -import net.ess3.api.server.Location; -import net.ess3.api.server.Material; -//TODO: remove bukkit import org.bukkit.block.CreatureSpawner; diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java index 21f79a657..ea908f0b9 100644 --- a/Essentials/src/net/ess3/commands/Commandspawnmob.java +++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java @@ -15,8 +15,8 @@ import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; import org.bukkit.DyeColor; import org.bukkit.block.Block; -import org.bukkit.entity.Villager.Profession; import org.bukkit.entity.*; +import org.bukkit.entity.Villager.Profession; import org.bukkit.material.Colorable; //TODO - Bukkit cleanup diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index fe3f01b1f..a3e648d28 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -2,7 +2,6 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; - import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 8cd17d683..aa4eb0b22 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -1,13 +1,12 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; - import net.ess3.api.IUser; +import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import lombok.Cleanup; -import net.ess3.api.server.CommandSender; public class Commandtogglejail extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java index 17edad493..13775f7cc 100644 --- a/Essentials/src/net/ess3/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -1,10 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; import net.ess3.api.server.Location; -//TODO: remove bukkit +import net.ess3.economy.Trade; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index a9b4873d6..eeeffa2e6 100644 --- a/Essentials/src/net/ess3/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -9,7 +9,6 @@ import net.ess3.api.server.CommandSender; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -//TODO: remove bukkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index 0d758df7f..f6cfff691 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -1,11 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.ISettings; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; -//TODO: remove bukkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index 107db6bcd..95d3c0d07 100644 --- a/Essentials/src/net/ess3/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -7,7 +7,6 @@ import net.ess3.api.IUser; import net.ess3.api.server.CommandSender; import net.ess3.api.server.Player; import net.ess3.permissions.WorldPermissions; -//TODO: remove bukkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java index 7b26f53d4..545489ac3 100644 --- a/Essentials/src/net/ess3/commands/Commandtphere.java +++ b/Essentials/src/net/ess3/commands/Commandtphere.java @@ -1,10 +1,9 @@ package net.ess3.commands; +import lombok.Cleanup; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; -import lombok.Cleanup; -//TODO: remove bukkit +import net.ess3.economy.Trade; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java index 8cef5bb81..9ffb9870d 100644 --- a/Essentials/src/net/ess3/commands/Commandtpo.java +++ b/Essentials/src/net/ess3/commands/Commandtpo.java @@ -3,7 +3,6 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -//TODO: remove bukkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java index d58384144..5fa76c640 100644 --- a/Essentials/src/net/ess3/commands/Commandtpohere.java +++ b/Essentials/src/net/ess3/commands/Commandtpohere.java @@ -6,7 +6,6 @@ import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; -//TODO: remove buikkit import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -42,7 +41,7 @@ public class Commandtpohere extends EssentialsCommand // Verify permission if (!player.isHidden() || Permissions.TELEPORT_HIDDEN.isAuthorized(user)) { - player.getTeleport().now(user, false, TeleportCause.COMMAND); + player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND); user.sendMessage(_("teleporting")); } else diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index 2a2318a1d..dc7f001a9 100644 --- a/Essentials/src/net/ess3/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.Locale; +import java.util.Set; +import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.permissions.UnlimitedItemPermissions; -import java.util.Locale; -import java.util.Set; -import lombok.Cleanup; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index 53a86941f..fcf2e5fac 100644 --- a/Essentials/src/net/ess3/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -1,16 +1,16 @@ package net.ess3.commands; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.economy.Trade; -import net.ess3.utils.Util; import net.ess3.api.IUser; import net.ess3.api.IWarps; +import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WarpPermissions; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java index bff368964..d67af9e66 100644 --- a/Essentials/src/net/ess3/commands/Commandworld.java +++ b/Essentials/src/net/ess3/commands/Commandworld.java @@ -1,11 +1,10 @@ package net.ess3.commands; +import java.util.List; import static net.ess3.I18n._; -import net.ess3.economy.Trade; import net.ess3.api.IUser; +import net.ess3.economy.Trade; import net.ess3.permissions.WorldPermissions; -import java.util.List; -//TODO: remove bukkit import org.bukkit.Location; import org.bukkit.World; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index 99bed8a21..9bf9ca561 100644 --- a/Essentials/src/net/ess3/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -1,9 +1,9 @@ package net.ess3.commands; +import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.utils.Util; import net.ess3.api.IUser; -import java.util.Locale; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 5eedf4ce0..85f90a5f1 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import java.util.logging.Logger; import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.AbstractSuperpermsPermission; -import java.util.logging.Logger; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index 9c8c80803..c56660d17 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -1,10 +1,5 @@ package net.ess3.listener; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import java.util.List; import lombok.Cleanup; import static net.ess3.I18n._; @@ -21,8 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.event.entity.*; +import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index b09cc84cb..aa411cb69 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -29,8 +29,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.*; +import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java index 14710a995..46020336b 100644 --- a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java +++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java @@ -1,8 +1,7 @@ package net.ess3.permissions; -import net.ess3.bukkit.PermissionFactory; import net.ess3.api.IPermission; -import net.ess3.utils.Util; +import net.ess3.bukkit.PermissionFactory; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/KitPermissions.java b/Essentials/src/net/ess3/permissions/KitPermissions.java index c01768fa6..00365aeac 100644 --- a/Essentials/src/net/ess3/permissions/KitPermissions.java +++ b/Essentials/src/net/ess3/permissions/KitPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index b550d9ca3..a005dab38 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -1,8 +1,8 @@ package net.ess3.permissions; -import net.ess3.bukkit.PermissionFactory; import java.util.Locale; import net.ess3.api.IPermission; +import net.ess3.bukkit.PermissionFactory; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/permissions/WarpPermissions.java b/Essentials/src/net/ess3/permissions/WarpPermissions.java index f8d146b61..c87d78437 100644 --- a/Essentials/src/net/ess3/permissions/WarpPermissions.java +++ b/Essentials/src/net/ess3/permissions/WarpPermissions.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.api.IPermission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/net/ess3/settings/Warp.java b/Essentials/src/net/ess3/settings/Warp.java index 2dced7328..99ce3cce7 100644 --- a/Essentials/src/net/ess3/settings/Warp.java +++ b/Essentials/src/net/ess3/settings/Warp.java @@ -2,8 +2,8 @@ package net.ess3.settings; import lombok.Data; import lombok.EqualsAndHashCode; -import net.ess3.storage.StoredLocation; import net.ess3.storage.StorageObject; +import net.ess3.storage.StoredLocation; @Data @EqualsAndHashCode(callSuper = false) diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java index cc75a0e63..7a8b96769 100644 --- a/Essentials/src/net/ess3/settings/WorldOptions.java +++ b/Essentials/src/net/ess3/settings/WorldOptions.java @@ -1,9 +1,9 @@ package net.ess3.settings; -import net.ess3.storage.Comment; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data @EqualsAndHashCode(callSuper = false) diff --git a/Essentials/src/net/ess3/settings/geoip/Database.java b/Essentials/src/net/ess3/settings/geoip/Database.java index 3573a9e16..5791853a3 100644 --- a/Essentials/src/net/ess3/settings/geoip/Database.java +++ b/Essentials/src/net/ess3/settings/geoip/Database.java @@ -1,8 +1,8 @@ package net.ess3.settings.geoip; -import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.StorageObject; @Data diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java index 7b50be568..2785a10d2 100644 --- a/Essentials/src/net/ess3/settings/protect/Prevent.java +++ b/Essentials/src/net/ess3/settings/protect/Prevent.java @@ -1,11 +1,10 @@ package net.ess3.settings.protect; -import net.ess3.storage.*; -import java.util.HashMap; import java.util.HashSet; import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; +import net.ess3.storage.*; import org.bukkit.Material; diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index e92709dea..d4359ecc1 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -6,7 +6,6 @@ import java.io.FileReader; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import net.ess3.Essentials; import net.ess3.api.IEssentials; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index f728ff7a0..0be1feac3 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import net.ess3.Essentials; import net.ess3.api.IEssentials; import org.bukkit.Bukkit; diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index e72aaea79..1a5159456 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -11,7 +11,6 @@ import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; -import org.bukkit.plugin.Plugin; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index bc5187205..f80b9a521 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -1,13 +1,6 @@ package net.ess3.user; import java.lang.ref.WeakReference; -import static net.ess3.I18n._; -import net.ess3.Teleport; -import net.ess3.api.*; -import net.ess3.economy.register.Method; -import net.ess3.permissions.Permissions; -import net.ess3.utils.DateUtil; -import net.ess3.utils.Util; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; @@ -17,6 +10,13 @@ import lombok.Cleanup; import lombok.Getter; import lombok.Setter; import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.Teleport; +import net.ess3.api.*; +import net.ess3.economy.register.Method; +import net.ess3.permissions.Permissions; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index 9fa50f0df..e4c79c4b4 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -14,7 +14,6 @@ import net.ess3.api.IUser; import net.ess3.api.InvalidNameException; import net.ess3.utils.gnu.inet.encoding.Punycode; import net.ess3.utils.gnu.inet.encoding.PunycodeException; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index dc58ecc5e..15f0954f6 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -1,14 +1,14 @@ package net.ess3.utils.textreader; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.utils.DescParseTickFormat; import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import lombok.Cleanup; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.utils.DescParseTickFormat; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/test/net/ess3/FakeServer.java b/Essentials/test/net/ess3/FakeServer.java index aeed3e4b8..86f5329fe 100644 --- a/Essentials/test/net/ess3/FakeServer.java +++ b/Essentials/test/net/ess3/FakeServer.java @@ -6,8 +6,8 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.logging.Logger; -import org.bukkit.World.Environment; import org.bukkit.*; +import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.PluginCommand; diff --git a/Essentials/test/net/ess3/UserTest.java b/Essentials/test/net/ess3/UserTest.java index 220f56f3c..28624be80 100644 --- a/Essentials/test/net/ess3/UserTest.java +++ b/Essentials/test/net/ess3/UserTest.java @@ -1,11 +1,6 @@ package net.ess3; -import java.io.IOException; -import junit.framework.TestCase; import net.ess3.api.IUser; -import net.ess3.user.User; -import org.bukkit.World.Environment; -import org.bukkit.plugin.InvalidDescriptionException; public class UserTest extends EssentialsTest diff --git a/Essentials/test/net/ess3/UtilTest.java b/Essentials/test/net/ess3/UtilTest.java index dc7dc7b66..77035da03 100644 --- a/Essentials/test/net/ess3/UtilTest.java +++ b/Essentials/test/net/ess3/UtilTest.java @@ -1,13 +1,12 @@ package net.ess3; -import net.ess3.api.InvalidNameException; -import net.ess3.utils.DateUtil; -import net.ess3.utils.Util; - import java.util.Calendar; import java.util.GregorianCalendar; import java.util.logging.Level; import java.util.logging.Logger; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; public class UtilTest extends EssentialsTest diff --git a/Essentials/test/net/ess3/testserver/TestPlayer.java b/Essentials/test/net/ess3/testserver/TestPlayer.java index 5f4e75f17..803fa145f 100644 --- a/Essentials/test/net/ess3/testserver/TestPlayer.java +++ b/Essentials/test/net/ess3/testserver/TestPlayer.java @@ -1,7 +1,6 @@ package net.ess3.testserver; import net.ess3.api.IUser; -import net.ess3.api.server.*; public class TestPlayer implements Player { -- cgit v1.2.3