diff options
206 files changed, 526 insertions, 1016 deletions
diff --git a/Essentials/src/net/ess3/Console.java b/Essentials/src/net/ess3/Console.java index 02c77b253..93c638a77 100644 --- a/Essentials/src/net/ess3/Console.java +++ b/Essentials/src/net/ess3/Console.java @@ -1,7 +1,7 @@ package net.ess3; -import org.bukkit.command.CommandSender; import net.ess3.api.IReplyTo; +import org.bukkit.command.CommandSender; public final class Console implements IReplyTo diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index f5a8752d8..3bbe79411 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -17,19 +17,15 @@ */ package net.ess3; -import static net.ess3.I18n._; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.plugin.InvalidDescriptionException; import lombok.Getter; import lombok.Setter; +import static net.ess3.I18n._; import net.ess3.api.*; import net.ess3.backup.Backup; import net.ess3.commands.EssentialsCommandHandler; @@ -44,6 +40,10 @@ import net.ess3.settings.SpawnsHolder; import net.ess3.storage.StorageQueue; import net.ess3.user.UserMap; import net.ess3.utils.ExecuteTimer; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.plugin.InvalidDescriptionException; public class Essentials implements IEssentials diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 87e872fcf..0bd902b17 100644 --- a/Essentials/src/net/ess3/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -2,12 +2,12 @@ package net.ess3; import java.util.*; import java.util.logging.Level; -import org.bukkit.entity.Player; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; +import org.bukkit.entity.Player; public class EssentialsTimer implements Runnable diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index f3bdbc883..7e7ca0ede 100644 --- a/Essentials/src/net/ess3/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -1,21 +1,20 @@ package net.ess3; -import static net.ess3.I18n._; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; - -import net.ess3.api.ISettings; -import net.ess3.utils.Util; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IItemDb; +import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.storage.ManagedFile; +import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class ItemDb implements IItemDb @@ -65,6 +64,7 @@ public class ItemDb implements IItemDb } } + @Override public ItemStack get(final String id, final IUser user) throws Exception { final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH)); diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index b7df33da5..0affe3fca 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -1,6 +1,5 @@ package net.ess3; -import static net.ess3.I18n._; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -8,6 +7,11 @@ import java.util.Collections; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IJails; +import net.ess3.api.IUser; +import net.ess3.storage.AsyncStorageObjectHolder; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.event.EventHandler; @@ -22,10 +26,6 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.PluginManager; -import net.ess3.api.IEssentials; -import net.ess3.api.IJails; -import net.ess3.api.IUser; -import net.ess3.storage.AsyncStorageObjectHolder; public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails diff --git a/Essentials/src/net/ess3/Kits.java b/Essentials/src/net/ess3/Kits.java index b68b3ccd0..efda33f2e 100644 --- a/Essentials/src/net/ess3/Kits.java +++ b/Essentials/src/net/ess3/Kits.java @@ -1,9 +1,8 @@ package net.ess3; -import static net.ess3.I18n._; import java.io.File; import java.util.*; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IKits; import net.ess3.api.IUser; @@ -12,6 +11,7 @@ import net.ess3.settings.Kit; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.inventory.ItemStack; public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java index 42ee5a3fb..47cd07049 100644 --- a/Essentials/src/net/ess3/SpawnMob.java +++ b/Essentials/src/net/ess3/SpawnMob.java @@ -1,16 +1,8 @@ package net.ess3; -import static net.ess3.I18n._; import java.util.*; import java.util.regex.Pattern; -import org.bukkit.DyeColor; -import org.bukkit.Location; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.*; -import org.bukkit.material.Colorable; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; @@ -21,6 +13,14 @@ import net.ess3.permissions.Permissions; import net.ess3.user.User; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; +import org.bukkit.DyeColor; +import org.bukkit.Location; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.*; +import org.bukkit.material.Colorable; public class SpawnMob diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java index 81272069b..b97b1f58d 100644 --- a/Essentials/src/net/ess3/Teleport.java +++ b/Essentials/src/net/ess3/Teleport.java @@ -1,11 +1,8 @@ package net.ess3; -import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ITeleport; import net.ess3.api.IUser; @@ -16,6 +13,9 @@ import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; import net.ess3.utils.LocationUtil; import net.ess3.utils.Target; +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Teleport implements Runnable, ITeleport @@ -253,6 +253,7 @@ public class Teleport implements Runnable, ITeleport } //The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere + @Override public void teleportToMe(IUser otherUser, Trade chargeFor, TeleportCause cause) throws Exception { final Target target = new Target(user.getPlayer()); diff --git a/Essentials/src/net/ess3/Warps.java b/Essentials/src/net/ess3/Warps.java index 55bfbff1e..2b3002e0b 100644 --- a/Essentials/src/net/ess3/Warps.java +++ b/Essentials/src/net/ess3/Warps.java @@ -1,9 +1,8 @@ package net.ess3; -import static net.ess3.I18n._; import java.io.File; import java.util.*; -import org.bukkit.Location; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IWarp; import net.ess3.api.IWarps; @@ -11,6 +10,7 @@ import net.ess3.api.InvalidNameException; import net.ess3.commands.WarpNotFoundException; import net.ess3.settings.WarpHolder; import net.ess3.storage.StorageObjectMap; +import org.bukkit.Location; public class Warps extends StorageObjectMap<IWarp> implements IWarps diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 47cdb805a..68d975b57 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -2,13 +2,13 @@ package net.ess3.api; import java.util.List; import java.util.logging.Logger; -import org.bukkit.Server; -import org.bukkit.World; import net.ess3.EssentialsTimer; import net.ess3.economy.register.Methods; import net.ess3.metrics.Metrics; import net.ess3.settings.SpawnsHolder; import net.ess3.storage.StorageQueue; +import org.bukkit.Server; +import org.bukkit.World; public interface IEssentials extends IComponent diff --git a/Essentials/src/net/ess3/api/IPlugin.java b/Essentials/src/net/ess3/api/IPlugin.java index 9a248438b..8348c9490 100644 --- a/Essentials/src/net/ess3/api/IPlugin.java +++ b/Essentials/src/net/ess3/api/IPlugin.java @@ -132,7 +132,7 @@ public interface IPlugin extends Plugin public void onPluginDisable(Plugin plugin); /** - * Register a module with Essentils + * Register a module with Essentials * * @param module - Your plugin instance */ diff --git a/Essentials/src/net/ess3/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java index 7922e0db5..a88b72071 100644 --- a/Essentials/src/net/ess3/api/ITeleport.java +++ b/Essentials/src/net/ess3/api/ITeleport.java @@ -1,10 +1,10 @@ package net.ess3.api; +import net.ess3.economy.Trade; +import net.ess3.utils.Target; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import net.ess3.economy.Trade; -import net.ess3.utils.Target; public interface ITeleport diff --git a/Essentials/src/net/ess3/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java index 80ed02702..dc809876c 100755 --- a/Essentials/src/net/ess3/api/IUser.java +++ b/Essentials/src/net/ess3/api/IUser.java @@ -2,20 +2,20 @@ package net.ess3.api; import java.util.List; import java.util.Set; +import net.ess3.storage.IStorageObjectHolder; +import net.ess3.user.CooldownException; +import net.ess3.user.UserData; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import net.ess3.storage.IStorageObjectHolder; -import net.ess3.user.CooldownException; -import net.ess3.user.UserData; public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser> { /** - * Get the ammount of money in a users account + * Get the amount of money in a users account * * @return */ diff --git a/Essentials/src/net/ess3/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java index 692170fb9..0a027e5ae 100644 --- a/Essentials/src/net/ess3/api/IUserMap.java +++ b/Essentials/src/net/ess3/api/IUserMap.java @@ -2,9 +2,9 @@ package net.ess3.api; import java.io.File; import java.util.Set; -import org.bukkit.entity.Player; import net.ess3.user.PlayerNotFoundException; import net.ess3.user.TooManyMatchesException; +import org.bukkit.entity.Player; public interface IUserMap extends IReload diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index 35d3cd3cb..bbff922cc 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -1,16 +1,16 @@ package net.ess3.backup; -import static net.ess3.I18n._; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; +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; public class Backup implements Runnable, IBackup diff --git a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java index 9c7e20cd3..1e2ed3e4e 100644 --- a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java +++ b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java @@ -1,12 +1,21 @@ package net.ess3.bukkit; -import static net.ess3.I18n._; import java.io.File; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; +import net.ess3.Essentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IPlugin; +import net.ess3.listener.EssentialsBlockListener; +import net.ess3.listener.EssentialsEntityListener; +import net.ess3.listener.EssentialsPlayerListener; +import net.ess3.listener.EssentialsPluginListener; +import net.ess3.metrics.MetricsListener; +import net.ess3.metrics.MetricsStarter; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -22,15 +31,6 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.scheduler.BukkitTask; -import net.ess3.Essentials; -import net.ess3.api.IEssentials; -import net.ess3.api.IPlugin; -import net.ess3.listener.EssentialsBlockListener; -import net.ess3.listener.EssentialsEntityListener; -import net.ess3.listener.EssentialsPlayerListener; -import net.ess3.listener.EssentialsPluginListener; -import net.ess3.metrics.MetricsListener; -import net.ess3.metrics.MetricsStarter; public class BukkitPlugin extends JavaPlugin implements IPlugin diff --git a/Essentials/src/net/ess3/bukkit/Enchantments.java b/Essentials/src/net/ess3/bukkit/Enchantments.java index 194154338..e76adc8b5 100644 --- a/Essentials/src/net/ess3/bukkit/Enchantments.java +++ b/Essentials/src/net/ess3/bukkit/Enchantments.java @@ -5,7 +5,6 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import net.ess3.utils.Util; import org.bukkit.enchantments.Enchantment; diff --git a/Essentials/src/net/ess3/bukkit/LivingEntities.java b/Essentials/src/net/ess3/bukkit/LivingEntities.java index 81ad2f1f5..c51285973 100644 --- a/Essentials/src/net/ess3/bukkit/LivingEntities.java +++ b/Essentials/src/net/ess3/bukkit/LivingEntities.java @@ -1,7 +1,7 @@ package net.ess3.bukkit; -import static net.ess3.I18n._; import java.util.*; +import static net.ess3.I18n._; import org.bukkit.entity.EntityType; diff --git a/Essentials/src/net/ess3/bukkit/PermissionFactory.java b/Essentials/src/net/ess3/bukkit/PermissionFactory.java index b8a96b409..f3e84b54b 100644 --- a/Essentials/src/net/ess3/bukkit/PermissionFactory.java +++ b/Essentials/src/net/ess3/bukkit/PermissionFactory.java @@ -1,12 +1,12 @@ package net.ess3.bukkit; import java.util.StringTokenizer; +import net.ess3.api.IPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.PluginManager; -import net.ess3.api.IPermission; public class PermissionFactory diff --git a/Essentials/src/net/ess3/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java index 190873eec..311e6c8ee 100644 --- a/Essentials/src/net/ess3/bukkit/VersionCheck.java +++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java @@ -1,10 +1,10 @@ package net.ess3.bukkit; -import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; 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/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java index 0e3c841e7..85f423c6f 100644 --- a/Essentials/src/net/ess3/commands/Commandbackup.java +++ b/Essentials/src/net/ess3/commands/Commandbackup.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IBackup; +import org.bukkit.command.CommandSender; public class Commandbackup extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java index 2fb325ab9..6fff35c6b 100644 --- a/Essentials/src/net/ess3/commands/Commandbalance.java +++ b/Essentials/src/net/ess3/commands/Commandbalance.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; public class Commandbalance extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index dd5712f13..1d4201224 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.FormatUtil; import net.ess3.utils.textreader.ArrayListInput; import net.ess3.utils.textreader.TextPager; +import org.bukkit.command.CommandSender; public class Commandbalancetop extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index 94f05e76e..a7f66016b 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 static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; +import org.bukkit.command.CommandSender; public class Commandbanip extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java index 22331f2de..22b829e6c 100644 --- a/Essentials/src/net/ess3/commands/Commandbreak.java +++ b/Essentials/src/net/ess3/commands/Commandbreak.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandbreak extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java index f47e2068b..6999a5fe7 100644 --- a/Essentials/src/net/ess3/commands/Commandbroadcast.java +++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; public class Commandbroadcast extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java index d30ddc7aa..4f0e90478 100644 --- a/Essentials/src/net/ess3/commands/Commandburn.java +++ b/Essentials/src/net/ess3/commands/Commandburn.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; public class Commandburn extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index 0f8424d3d..70f8e4773 100644 --- a/Essentials/src/net/ess3/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.List; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandclearinventory extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 3bde21493..133db6769 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commanddelhome extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index 7176c16d9..f61898d91 100644 --- a/Essentials/src/net/ess3/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandeco extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index dab1a5efb..6d82d386b 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.bukkit.Enchantments; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; public class Commandenchant extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandenderchest.java b/Essentials/src/net/ess3/commands/Commandenderchest.java index 2ab3ed61f..31d011597 100644 --- a/Essentials/src/net/ess3/commands/Commandenderchest.java +++ b/Essentials/src/net/ess3/commands/Commandenderchest.java @@ -1,8 +1,8 @@ package net.ess3.commands; -import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.entity.Player; public class Commandenderchest extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index 873977aa8..405a3c3d1 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -1,7 +1,7 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Map; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java index 210eb59b6..a489a49bb 100644 --- a/Essentials/src/net/ess3/commands/Commandexp.java +++ b/Essentials/src/net/ess3/commands/Commandexp.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.craftbukkit.SetExpFix; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; public class Commandexp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java index 25d2a5a04..47c355c3a 100644 --- a/Essentials/src/net/ess3/commands/Commandext.java +++ b/Essentials/src/net/ess3/commands/Commandext.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; public class Commandext extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java index aa2e881d4..4969580ed 100644 --- a/Essentials/src/net/ess3/commands/Commandfeed.java +++ b/Essentials/src/net/ess3/commands/Commandfeed.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Set; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandfeed extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java index 1927bbbbe..e82379086 100644 --- a/Essentials/src/net/ess3/commands/Commandfireball.java +++ b/Essentials/src/net/ess3/commands/Commandfireball.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import net.ess3.api.IUser; import org.bukkit.entity.*; import org.bukkit.util.Vector; -import net.ess3.api.IUser; public class Commandfireball extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java index 607040096..b57a21fed 100644 --- a/Essentials/src/net/ess3/commands/Commandfly.java +++ b/Essentials/src/net/ess3/commands/Commandfly.java @@ -1,14 +1,15 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandfly extends EssentialsToggleCommand { + @Override protected void setValue(final IUser player, final boolean value) { final Player realPlayer = player.getPlayer(); @@ -19,11 +20,13 @@ public class Commandfly extends EssentialsToggleCommand } } + @Override protected boolean getValue(final IUser player) { return player.getPlayer().getAllowFlight(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -36,22 +39,26 @@ public class Commandfly extends EssentialsToggleCommand } } + @Override protected void informPlayer(final IUser player) { final String message = _("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()); player.sendMessage(message); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.FLY_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return Permissions.FLY_EXEMPT.isAuthorized(player); } + @Override protected boolean toggleOfflinePlayers() { return false; diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java index caf2ae767..96eb7ae1f 100644 --- a/Essentials/src/net/ess3/commands/Commandgamemode.java +++ b/Essentials/src/net/ess3/commands/Commandgamemode.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.GameMode; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.GameMode; +import org.bukkit.command.CommandSender; public class Commandgamemode extends EssentialsSettingsCommand @@ -25,6 +25,7 @@ public class Commandgamemode extends EssentialsSettingsCommand return player.getPlayer().getGameMode(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -37,27 +38,32 @@ public class Commandgamemode extends EssentialsSettingsCommand } } + @Override protected void informPlayer(final IUser player) { final String message = _("gameMode", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName()); player.sendMessage(message); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.GAMEMODE_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return Permissions.GAMEMODE_EXEMPT.isAuthorized(player); } + @Override protected boolean toggleOfflinePlayers() { return false; } + @Override protected boolean canMatch(final String arg) { try @@ -71,6 +77,7 @@ public class Commandgamemode extends EssentialsSettingsCommand } } + @Override protected void playerMatch(final IUser player, final String arg) throws NotEnoughArgumentsException { if (arg == null) diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java index 36092eb8b..666393a0c 100644 --- a/Essentials/src/net/ess3/commands/Commandgc.java +++ b/Essentials/src/net/ess3/commands/Commandgc.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.lang.management.ManagementFactory; +import static net.ess3.I18n._; +import net.ess3.utils.DateUtil; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; -import net.ess3.utils.DateUtil; public class Commandgc extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java index 03c0bbce6..e7ab21673 100644 --- a/Essentials/src/net/ess3/commands/Commandgetpos.java +++ b/Essentials/src/net/ess3/commands/Commandgetpos.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandgetpos extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index 090b4ef27..d102becfa 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import org.bukkit.command.CommandSender; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; public class Commandgive extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java index 9889e067a..39398cdd0 100644 --- a/Essentials/src/net/ess3/commands/Commandgod.java +++ b/Essentials/src/net/ess3/commands/Commandgod.java @@ -1,24 +1,27 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commandgod extends EssentialsToggleCommand { + @Override protected void setValue(final IUser player, final boolean value) { player.setGodModeEnabled(value); player.queueSave(); } + @Override protected boolean getValue(final IUser player) { return player.isGodModeEnabled(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -31,17 +34,20 @@ public class Commandgod extends EssentialsToggleCommand } } + @Override protected void informPlayer(final IUser player) { final String message = _("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()); player.sendMessage(message); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.GOD_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return (player.isOnline() ? Permissions.GOD_EXEMPT.isAuthorized(player) : !Permissions.GOD_OFFLINE.isAuthorized(sender)); diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java index ce1ead49f..aa8a87068 100644 --- a/Essentials/src/net/ess3/commands/Commandhat.java +++ b/Essentials/src/net/ess3/commands/Commandhat.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import net.ess3.api.IUser; -import net.ess3.craftbukkit.InventoryWorkaround; public class Commandhat extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java index 88670ec5d..d9a1a73af 100644 --- a/Essentials/src/net/ess3/commands/Commandheal.java +++ b/Essentials/src/net/ess3/commands/Commandheal.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Set; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandheal extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java index a7cfc5c99..25f9640c2 100644 --- a/Essentials/src/net/ess3/commands/Commandhelp.java +++ b/Essentials/src/net/ess3/commands/Commandhelp.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.utils.Util; import net.ess3.utils.textreader.*; +import org.bukkit.command.CommandSender; public class Commandhelp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java index 303b46981..55bdd77e4 100644 --- a/Essentials/src/net/ess3/commands/Commandhelpop.java +++ b/Essentials/src/net/ess3/commands/Commandhelpop.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.logging.Level; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.entity.Player; public class Commandhelpop extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index 05c02e805..5781b5124 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -1,16 +1,16 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.Set; import java.util.regex.Pattern; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandhome extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandinfo.java b/Essentials/src/net/ess3/commands/Commandinfo.java index e6e15dd99..cf8d90818 100644 --- a/Essentials/src/net/ess3/commands/Commandinfo.java +++ b/Essentials/src/net/ess3/commands/Commandinfo.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; +import org.bukkit.command.CommandSender; public class Commandinfo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java index 2f6e74190..aaf5e0479 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 static net.ess3.I18n._; import java.util.Arrays; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.user.Inventory; +import org.bukkit.inventory.ItemStack; public class Commandinvsee extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index e544c620e..416bed766 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; public class Commanditem extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java index cf5ab1142..3ee9b06e8 100644 --- a/Essentials/src/net/ess3/commands/Commanditemdb.java +++ b/Essentials/src/net/ess3/commands/Commanditemdb.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IUser; public class Commanditemdb extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandjails.java b/Essentials/src/net/ess3/commands/Commandjails.java index cb2b6b6f1..7e1243e47 100644 --- a/Essentials/src/net/ess3/commands/Commandjails.java +++ b/Essentials/src/net/ess3/commands/Commandjails.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import net.ess3.utils.Util; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import net.ess3.utils.Util; public class Commandjails extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java index 402bcffff..835db0fb9 100644 --- a/Essentials/src/net/ess3/commands/Commandjump.java +++ b/Essentials/src/net/ess3/commands/Commandjump.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.Location; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.utils.LocationUtil; +import org.bukkit.Location; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandjump extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 75d2997ba..cd78f441b 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandkill extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java index de3a94d29..cbdffd6a6 100644 --- a/Essentials/src/net/ess3/commands/Commandkillall.java +++ b/Essentials/src/net/ess3/commands/Commandkillall.java @@ -1,8 +1,9 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Collections; import java.util.Locale; +import static net.ess3.I18n._; +import net.ess3.bukkit.LivingEntities; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; @@ -10,7 +11,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.*; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; -import net.ess3.bukkit.LivingEntities; public class Commandkillall extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java index 9bdd9dbb9..61a091a2a 100644 --- a/Essentials/src/net/ess3/commands/Commandkit.java +++ b/Essentials/src/net/ess3/commands/Commandkit.java @@ -1,8 +1,8 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Collection; import java.util.Locale; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java index 894f6b90a..8ee22a05a 100644 --- a/Essentials/src/net/ess3/commands/Commandlightning.java +++ b/Essentials/src/net/ess3/commands/Commandlightning.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.LightningStrike; +import org.bukkit.entity.Player; public class Commandlightning extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index b18e23de7..9513b5347 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 static net.ess3.I18n._; import java.util.*; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandlist extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java index 1786c706f..94fc67bf3 100644 --- a/Essentials/src/net/ess3/commands/Commandmail.java +++ b/Essentials/src/net/ess3/commands/Commandmail.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.List; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; public class Commandmail extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index c0613308c..3c4edf7ea 100644 --- a/Essentials/src/net/ess3/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.ChargeException; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; public class Commandmore extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmotd.java b/Essentials/src/net/ess3/commands/Commandmotd.java index b82bc7694..907a41b34 100644 --- a/Essentials/src/net/ess3/commands/Commandmotd.java +++ b/Essentials/src/net/ess3/commands/Commandmotd.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; +import org.bukkit.command.CommandSender; public class Commandmotd extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index 575e7bb10..5db89ba84 100644 --- a/Essentials/src/net/ess3/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Set; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.Console; +import static net.ess3.I18n._; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandmsg extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index a80b61f0a..7b7d232ed 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; public class Commandmute extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java index 5f0536af6..db22e249f 100644 --- a/Essentials/src/net/ess3/commands/Commandnear.java +++ b/Essentials/src/net/ess3/commands/Commandnear.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandnear extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java index c5cbf45dd..ceb7d15a4 100644 --- a/Essentials/src/net/ess3/commands/Commandnick.java +++ b/Essentials/src/net/ess3/commands/Commandnick.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandnick extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java index d0f5b0244..c826dd0fb 100644 --- a/Essentials/src/net/ess3/commands/Commandpowertool.java +++ b/Essentials/src/net/ess3/commands/Commandpowertool.java @@ -1,15 +1,15 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class Commandpowertool extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index c339c6552..c82ad3669 100644 --- a/Essentials/src/net/ess3/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.*; -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.DescParseTickFormat; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandptime extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index cdee6a53e..92aabfd8a 100644 --- a/Essentials/src/net/ess3/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.Console; +import static net.ess3.I18n._; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; public class Commandr extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index b71d1618c..afbf82cc9 100644 --- a/Essentials/src/net/ess3/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandrealname extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java index df40e9df1..465729878 100644 --- a/Essentials/src/net/ess3/commands/Commandrecipe.java +++ b/Essentials/src/net/ess3/commands/Commandrecipe.java @@ -1,15 +1,15 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.inventory.*; -import net.ess3.api.IUser; -import net.ess3.utils.Util; public class Commandrecipe extends EssentialsCommand @@ -100,7 +100,7 @@ public class Commandrecipe extends EssentialsCommand } else { - final HashMap<Material, String> colorMap = new HashMap<Material, String>(); + final HashMap<Material, String> colorMap = new HashMap<Material, String>(); //Might be better as an Enum int i = 1; for (Character c : "abcdefghi".toCharArray()) // TODO: Faster to use new char[] { 'a','b','c','d','e','f','g','h','i' } ? { diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index 7fc3d1a80..456719f8f 100644 --- a/Essentials/src/net/ess3/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.*; -import net.ess3.api.IUser; //Todo: Fix this up diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index 42d5fad0a..54293aef4 100644 --- a/Essentials/src/net/ess3/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -1,16 +1,16 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.ChargeException; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class Commandrepair extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java index e382fe631..1e15a6097 100644 --- a/Essentials/src/net/ess3/commands/Commandrules.java +++ b/Essentials/src/net/ess3/commands/Commandrules.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; +import org.bukkit.command.CommandSender; public class Commandrules extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index 9613f2649..2851b42be 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.PlayerNotFoundException; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; public class Commandseen extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index d36f82ee1..dde03f8d7 100644 --- a/Essentials/src/net/ess3/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.logging.Level; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.utils.FormatUtil; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; public class Commandsell extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index 5477d2a05..d4eb74df3 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -1,8 +1,8 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 38ba6c7a6..401aa8ca9 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.Location; import net.ess3.api.IUser; import net.ess3.api.IWarps; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.Location; public class Commandsetwarp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java index 0e9fe6f74..568fff86a 100644 --- a/Essentials/src/net/ess3/commands/Commandsetworth.java +++ b/Essentials/src/net/ess3/commands/Commandsetworth.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IUser; public class Commandsetworth extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java index a61b632d0..765d7668f 100644 --- a/Essentials/src/net/ess3/commands/Commandsocialspy.java +++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java @@ -1,25 +1,28 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commandsocialspy extends EssentialsToggleCommand { + @Override protected void setValue(final IUser player, final boolean value) { player.getData().setSocialspy(value); player.queueSave(); } + @Override protected boolean getValue(final IUser player) { return player.getData().isSocialspy(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -32,17 +35,20 @@ public class Commandsocialspy extends EssentialsToggleCommand } } + @Override protected void informPlayer(final IUser player) { final String message = _("socialSpyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()); player.sendMessage(message); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.SOCIALSPY_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return (player.isOnline() ? Permissions.SOCIALSPY_EXEMPT.isAuthorized(player) : !Permissions.SOCIALSPY_OFFLINE.isAuthorized(sender)); diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 7d473d64f..2504a1576 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.Location; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; +import org.bukkit.Location; +import org.bukkit.command.CommandSender; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandspawn extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 8c4a375f0..74be65774 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.CreatureSpawner; -import org.bukkit.entity.EntityType; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.bukkit.LivingEntities; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.CreatureSpawner; +import org.bukkit.entity.EntityType; public class Commandspawner extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandspeed.java b/Essentials/src/net/ess3/commands/Commandspeed.java index c8da94bb6..c5f3b01fa 100644 --- a/Essentials/src/net/ess3/commands/Commandspeed.java +++ b/Essentials/src/net/ess3/commands/Commandspeed.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandspeed extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index be5fc75ce..74bab9efe 100644 --- a/Essentials/src/net/ess3/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; public class Commandsudo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java index 7fe2b4fe9..b589d866b 100644 --- a/Essentials/src/net/ess3/commands/Commandsuicide.java +++ b/Essentials/src/net/ess3/commands/Commandsuicide.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.entity.Player; import net.ess3.api.IUser; +import org.bukkit.entity.Player; public class Commandsuicide extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java index ee30a631d..5c2c472a0 100644 --- a/Essentials/src/net/ess3/commands/Commandthunder.java +++ b/Essentials/src/net/ess3/commands/Commandthunder.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.World; import net.ess3.api.IUser; +import org.bukkit.World; public class Commandthunder extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java index c56a55af4..bdd38b9fc 100644 --- a/Essentials/src/net/ess3/commands/Commandtime.java +++ b/Essentials/src/net/ess3/commands/Commandtime.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.*; -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.permissions.Permissions; import net.ess3.utils.DescParseTickFormat; import net.ess3.utils.Util; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtime extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 9c01905c8..6afa1eebd 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.command.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 35ba051bc..3f64a65bc 100644 --- a/Essentials/src/net/ess3/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; public class Commandtop extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index f3e693949..11ab0f56a 100644 --- a/Essentials/src/net/ess3/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.Console; +import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java index 58d5157d5..ff34db10f 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaall.java +++ b/Essentials/src/net/ess3/commands/Commandtpaall.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtpaall extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index 96fb6abfa..2acc1b221 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -1,14 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; - import net.ess3.api.ChargeException; -import net.ess3.utils.Util; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpaccept extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index 5def2fa11..ae061e0df 100644 --- a/Essentials/src/net/ess3/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpall extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java index 6c7e58fc8..46c9879f9 100644 --- a/Essentials/src/net/ess3/commands/Commandtphere.java +++ b/Essentials/src/net/ess3/commands/Commandtphere.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtphere extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java index d4ccc7f32..0ca3df387 100644 --- a/Essentials/src/net/ess3/commands/Commandtpo.java +++ b/Essentials/src/net/ess3/commands/Commandtpo.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java index f489fed2e..fdadfe88d 100644 --- a/Essentials/src/net/ess3/commands/Commandtpohere.java +++ b/Essentials/src/net/ess3/commands/Commandtpohere.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpohere extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java index 61bb4699d..13b4d7052 100644 --- a/Essentials/src/net/ess3/commands/Commandtppos.java +++ b/Essentials/src/net/ess3/commands/Commandtppos.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; public class Commandtppos extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java index 6c3a351fe..7be6506f8 100644 --- a/Essentials/src/net/ess3/commands/Commandtptoggle.java +++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java @@ -1,25 +1,28 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commandtptoggle extends EssentialsToggleCommand { + @Override protected void setValue(final IUser player, final boolean value) { player.getData().setTeleportEnabled(value); player.queueSave(); } + @Override protected boolean getValue(final IUser player) { return player.getData().isTeleportEnabled(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -32,17 +35,20 @@ public class Commandtptoggle extends EssentialsToggleCommand } } + @Override protected void informPlayer(final IUser player) { final String message = _("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()); player.sendMessage(message); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.TPTOGGLE_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return Permissions.TPTOGGLE_EXEMPT.isAuthorized(player); diff --git a/Essentials/src/net/ess3/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java index 60767ff91..e7d111b54 100644 --- a/Essentials/src/net/ess3/commands/Commandtree.java +++ b/Essentials/src/net/ess3/commands/Commandtree.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.Location; -import org.bukkit.TreeType; import net.ess3.api.IUser; import net.ess3.utils.LocationUtil; +import org.bukkit.Location; +import org.bukkit.TreeType; public class Commandtree extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java index 256125046..25a2c5755 100644 --- a/Essentials/src/net/ess3/commands/Commandunban.java +++ b/Essentials/src/net/ess3/commands/Commandunban.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; +import org.bukkit.command.CommandSender; public class Commandunban extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java index 51e938a08..325edea64 100644 --- a/Essentials/src/net/ess3/commands/Commandunbanip.java +++ b/Essentials/src/net/ess3/commands/Commandunbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; +import org.bukkit.command.CommandSender; public class Commandunbanip extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index c33c7ec6b..205691c20 100644 --- a/Essentials/src/net/ess3/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; import java.util.Set; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.permissions.Permissions; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class Commandunlimited extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java index 58be45487..65cedb1e0 100644 --- a/Essentials/src/net/ess3/commands/Commandvanish.java +++ b/Essentials/src/net/ess3/commands/Commandvanish.java @@ -1,23 +1,26 @@ package net.ess3.commands; import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commandvanish extends EssentialsToggleCommand { + @Override protected void setValue(final IUser player, final boolean value) { player.setVanished(value); } + @Override protected boolean getValue(final IUser player) { return player.isVanished(); } + @Override protected void informSender(final CommandSender sender, final boolean value, final IUser player) { if (value) @@ -30,21 +33,25 @@ public class Commandvanish extends EssentialsToggleCommand } } + @Override protected void informPlayer(final IUser player) { player.sendMessage(getValue(player) ? _("vanished") : _("unvanished")); } + @Override protected boolean canEditOthers(final IUser user) { return Permissions.VANISH_OTHERS.isAuthorized(user); } + @Override protected boolean isExempt(final CommandSender sender, final IUser player) { return Permissions.VANISH_EXEMPT.isAuthorized(player); } + @Override protected boolean toggleOfflinePlayers() { return false; diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index ea3b8ca98..32cbc7c8c 100644 --- a/Essentials/src/net/ess3/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.IWarps; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandwarp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java index 6d6ae6756..0fd6a32fb 100644 --- a/Essentials/src/net/ess3/commands/Commandweather.java +++ b/Essentials/src/net/ess3/commands/Commandweather.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.World; import org.bukkit.command.CommandSender; -import net.ess3.api.IUser; public class Commandweather extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java index 7204410d7..cb6fa55c4 100644 --- a/Essentials/src/net/ess3/commands/Commandwhois.java +++ b/Essentials/src/net/ess3/commands/Commandwhois.java @@ -1,9 +1,7 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.craftbukkit.SetExpFix; @@ -11,6 +9,8 @@ import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.DateUtil; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandwhois extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java index 96b395303..9a629ef06 100644 --- a/Essentials/src/net/ess3/commands/Commandworld.java +++ b/Essentials/src/net/ess3/commands/Commandworld.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.List; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.permissions.Permissions; public class Commandworld extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index d6d1b26be..dad600602 100644 --- a/Essentials/src/net/ess3/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.inventory.ItemStack; public class Commandworth extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 7291f4f00..42fbd0f3d 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.List; import java.util.logging.Logger; -import org.bukkit.Server; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +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 org.bukkit.Server; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public abstract class EssentialsCommand extends AbstractSuperpermsPermission implements IEssentialsCommand @@ -23,6 +23,7 @@ public abstract class EssentialsCommand extends AbstractSuperpermsPermission imp protected transient Logger logger; private transient String permission; + @Override public void init(final IEssentials ess, final String commandName) { this.ess = ess; diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index 3f69613e8..e6930f8fc 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -1,15 +1,15 @@ package net.ess3.commands; -import static net.ess3.I18n._; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; +import net.ess3.api.*; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.*; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.api.*; public class EssentialsCommandHandler implements ICommandHandler, TabExecutor diff --git a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java index d3559222b..1ab327667 100644 --- a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java @@ -1,9 +1,9 @@ package net.ess3.commands; import java.util.Set; +import net.ess3.api.IUser; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import net.ess3.api.IUser; public abstract class EssentialsSettingsCommand extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java b/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java index c0b4468a0..c62fda512 100644 --- a/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java @@ -10,6 +10,7 @@ public abstract class EssentialsToggleCommand extends EssentialsSettingsCommand abstract protected boolean getValue(final IUser player); + @Override protected boolean canMatch(final String arg) { if (arg.equalsIgnoreCase("on") || arg.startsWith("enable") || arg.equalsIgnoreCase("1")) @@ -23,6 +24,7 @@ public abstract class EssentialsToggleCommand extends EssentialsSettingsCommand return false; } + @Override protected void playerMatch(final IUser player, final String arg) { if (arg == null) diff --git a/Essentials/src/net/ess3/commands/IEssentialsCommand.java b/Essentials/src/net/ess3/commands/IEssentialsCommand.java index 78324f106..a4de6ad85 100644 --- a/Essentials/src/net/ess3/commands/IEssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/IEssentialsCommand.java @@ -1,12 +1,12 @@ package net.ess3.commands; import java.util.List; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.IPermission; import net.ess3.api.IUser; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; public interface IEssentialsCommand extends IPermission diff --git a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java index af70d3efb..d7230fcde 100644 --- a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java +++ b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java @@ -8,6 +8,7 @@ import org.bukkit.inventory.ItemStack; /* * This class can be removed when https://github.com/Bukkit/CraftBukkit/pull/193 is accepted to CraftBukkit + * TODO: make sure this is up-to date */ diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index 8d5bd5ad6..15c2a2adc 100644 --- a/Essentials/src/net/ess3/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -1,6 +1,5 @@ package net.ess3.economy; -import static net.ess3.I18n._; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -10,14 +9,15 @@ import java.util.Locale; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Location; -import org.bukkit.inventory.ItemStack; +import static net.ess3.I18n._; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.permissions.Permissions; +import org.bukkit.Location; +import org.bukkit.inventory.ItemStack; public class Trade diff --git a/Essentials/src/net/ess3/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java index 68f086774..f2f3d2d64 100644 --- a/Essentials/src/net/ess3/economy/Worth.java +++ b/Essentials/src/net/ess3/economy/Worth.java @@ -3,13 +3,13 @@ package net.ess3.economy; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.bukkit.Material; -import org.bukkit.material.MaterialData; import lombok.*; import net.ess3.storage.EnchantmentLevel; import net.ess3.storage.MapKeyType; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; +import org.bukkit.Material; +import org.bukkit.material.MaterialData; @Data diff --git a/Essentials/src/net/ess3/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java index d955962db..6be2932d4 100644 --- a/Essentials/src/net/ess3/economy/WorthHolder.java +++ b/Essentials/src/net/ess3/economy/WorthHolder.java @@ -2,13 +2,13 @@ package net.ess3.economy; import java.io.File; import java.util.Map; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; -import org.bukkit.material.MaterialData; import net.ess3.api.IEssentials; import net.ess3.api.IWorth; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.storage.EnchantmentLevel; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; +import org.bukkit.material.MaterialData; public class WorthHolder extends AsyncStorageObjectHolder<net.ess3.economy.Worth> implements IWorth diff --git a/Essentials/src/net/ess3/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java index f5d3ad9b3..87d6feb6a 100644 --- a/Essentials/src/net/ess3/economy/register/Methods.java +++ b/Essentials/src/net/ess3/economy/register/Methods.java @@ -47,9 +47,7 @@ public class Methods { addMethod("iConomy", new net.ess3.economy.register.methods.iCo6()); addMethod("iConomy", new net.ess3.economy.register.methods.iCo5()); - addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE6()); addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7()); - addMethod("Currency", new net.ess3.economy.register.methods.MCUR()); Dependencies.add("MultiCurrency"); addMethod("Vault", new net.ess3.economy.register.methods.VaultEco()); } diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java deleted file mode 100644 index ae3096b4b..000000000 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java +++ /dev/null @@ -1,332 +0,0 @@ -package net.ess3.economy.register.methods; - -import org.bukkit.plugin.Plugin; -import cosine.boseconomy.BOSEconomy; -import net.ess3.economy.register.Method; - - -/** - * BOSEconomy 6 Implementation of Method - * - * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> - */ -@SuppressWarnings("deprecation") -public class BOSE6 implements Method -{ - private BOSEconomy BOSEconomy; - - @Override - public BOSEconomy getPlugin() - { - return this.BOSEconomy; - } - - @Override - public String getName() - { - return "BOSEconomy"; - } - - @Override - public String getLongName() - { - return getName(); - } - - @Override - public String getVersion() - { - return "0.6.2"; - } - - @Override - public int fractionalDigits() - { - return 0; - } - - @Override - public String format(double amount) - { - String currency = this.BOSEconomy.getMoneyNamePlural(); - - if (amount == 1) - { - currency = this.BOSEconomy.getMoneyName(); - } - - return amount + " " + currency; - } - - @Override - public boolean hasBanks() - { - return true; - } - - @Override - public boolean hasBank(String bank) - { - return this.BOSEconomy.bankExists(bank); - } - - @Override - public boolean hasAccount(String name) - { - return this.BOSEconomy.playerRegistered(name, false); - } - - @Override - public boolean hasBankAccount(String bank, String name) - { - return this.BOSEconomy.isBankOwner(bank, name) || this.BOSEconomy.isBankMember(bank, name); - } - - @Override - public boolean createAccount(String name) - { - if (hasAccount(name)) - { - return false; - } - - this.BOSEconomy.registerPlayer(name); - return true; - } - - @Override - public boolean createAccount(String name, Double balance) - { - if (hasAccount(name)) - { - return false; - } - - this.BOSEconomy.registerPlayer(name); - this.BOSEconomy.setPlayerMoney(name, balance, false); - return true; - } - - @Override - public MethodAccount getAccount(String name) - { - if (!hasAccount(name)) - { - return null; - } - - return new BOSEAccount(name, this.BOSEconomy); - } - - @Override - public MethodBankAccount getBankAccount(String bank, String name) - { - if (!hasBankAccount(bank, name)) - { - return null; - } - - return new BOSEBankAccount(bank, BOSEconomy); - } - - @Override - public boolean isCompatible(Plugin plugin) - { - return plugin.getDescription().getName().equalsIgnoreCase("boseconomy") && plugin instanceof BOSEconomy && plugin.getDescription().getVersion().equals( - "0.6.2"); - } - - @Override - public void setPlugin(Plugin plugin) - { - BOSEconomy = (BOSEconomy)plugin; - } - - - public class BOSEAccount implements MethodAccount - { - private final String name; - private final BOSEconomy BOSEconomy; - - public BOSEAccount(String name, BOSEconomy bOSEconomy) - { - this.name = name; - this.BOSEconomy = bOSEconomy; - } - - @Override - public double balance() - { - return (double)this.BOSEconomy.getPlayerMoney(this.name); - } - - @Override - public boolean set(double amount) - { - int IntAmount = (int)Math.ceil(amount); - return this.BOSEconomy.setPlayerMoney(this.name, IntAmount, false); - } - - @Override - public boolean add(double amount) - { - int IntAmount = (int)Math.ceil(amount); - return this.BOSEconomy.addPlayerMoney(this.name, IntAmount, false); - } - - @Override - public boolean subtract(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setPlayerMoney(this.name, (balance - IntAmount), false); - } - - @Override - public boolean multiply(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setPlayerMoney(this.name, (balance * IntAmount), false); - } - - @Override - public boolean divide(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setPlayerMoney(this.name, (balance / IntAmount), false); - } - - @Override - public boolean hasEnough(double amount) - { - return (this.balance() >= amount); - } - - @Override - public boolean hasOver(double amount) - { - return (this.balance() > amount); - } - - @Override - public boolean hasUnder(double amount) - { - return (this.balance() < amount); - } - - @Override - public boolean isNegative() - { - return (this.balance() < 0); - } - - @Override - public boolean remove() - { - return false; - } - } - - - public class BOSEBankAccount implements MethodBankAccount - { - private final String bank; - private final BOSEconomy BOSEconomy; - - public BOSEBankAccount(String bank, BOSEconomy bOSEconomy) - { - this.bank = bank; - this.BOSEconomy = bOSEconomy; - } - - @Override - public String getBankName() - { - return this.bank; - } - - @Override - public int getBankId() - { - return -1; - } - - @Override - public double balance() - { - return (double)this.BOSEconomy.getBankMoney(bank); - } - - @Override - public boolean set(double amount) - { - int IntAmount = (int)Math.ceil(amount); - return this.BOSEconomy.setBankMoney(bank, IntAmount, true); - } - - @Override - public boolean add(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setBankMoney(bank, (balance + IntAmount), false); - } - - @Override - public boolean subtract(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setBankMoney(bank, (balance - IntAmount), false); - } - - @Override - public boolean multiply(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setBankMoney(bank, (balance * IntAmount), false); - } - - @Override - public boolean divide(double amount) - { - int IntAmount = (int)Math.ceil(amount); - int balance = (int)this.balance(); - return this.BOSEconomy.setBankMoney(bank, (balance / IntAmount), false); - } - - @Override - public boolean hasEnough(double amount) - { - return (this.balance() >= amount); - } - - @Override - public boolean hasOver(double amount) - { - return (this.balance() > amount); - } - - @Override - public boolean hasUnder(double amount) - { - return (this.balance() < amount); - } - - @Override - public boolean isNegative() - { - return (this.balance() < 0); - } - - @Override - public boolean remove() - { - return this.BOSEconomy.removeBank(bank); - } - } -}
\ No newline at end of file diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java index 96cdafdec..cbb9b9314 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java @@ -1,8 +1,8 @@ package net.ess3.economy.register.methods; -import org.bukkit.plugin.Plugin; import cosine.boseconomy.BOSEconomy; import net.ess3.economy.register.Method; +import org.bukkit.plugin.Plugin; /** diff --git a/Essentials/src/net/ess3/economy/register/methods/MCUR.java b/Essentials/src/net/ess3/economy/register/methods/MCUR.java deleted file mode 100644 index 415882621..000000000 --- a/Essentials/src/net/ess3/economy/register/methods/MCUR.java +++ /dev/null @@ -1,194 +0,0 @@ -package net.ess3.economy.register.methods; - -import org.bukkit.plugin.Plugin; -import me.ashtheking.currency.Currency; -import me.ashtheking.currency.CurrencyList; -import net.ess3.economy.register.Method; - - -/** - * MultiCurrency Method implementation. - * - * @author Acrobot @copyright (c) 2011 @license AOL license <http://aol.nexua.org> - */ -public class MCUR implements Method -{ - private Currency currencyList; - - @Override - public Object getPlugin() - { - return this.currencyList; - } - - @Override - public String getName() - { - return "MultiCurrency"; - } - - @Override - public String getLongName() - { - return getName(); - } - - @Override - public String getVersion() - { - return "0.09"; - } - - @Override - public int fractionalDigits() - { - return -1; - } - - @Override - public String format(double amount) - { - return amount + " Currency"; - } - - @Override - public boolean hasBanks() - { - return false; - } - - @Override - public boolean hasBank(String bank) - { - return false; - } - - @Override - public boolean hasAccount(String name) - { - return true; - } - - @Override - public boolean hasBankAccount(String bank, String name) - { - return false; - } - - @Override - public boolean createAccount(String name) - { - CurrencyList.setValue((String)CurrencyList.maxCurrency(name)[0], name, 0); - return true; - } - - @Override - public boolean createAccount(String name, Double balance) - { - CurrencyList.setValue((String)CurrencyList.maxCurrency(name)[0], name, balance); - return true; - } - - @Override - public MethodAccount getAccount(String name) - { - return new MCurrencyAccount(name); - } - - @Override - public MethodBankAccount getBankAccount(String bank, String name) - { - return null; - } - - @Override - public boolean isCompatible(Plugin plugin) - { - return (plugin.getDescription().getName().equalsIgnoreCase("Currency") || plugin.getDescription().getName().equalsIgnoreCase( - "MultiCurrency")) && plugin instanceof Currency; - } - - @Override - public void setPlugin(Plugin plugin) - { - currencyList = (Currency)plugin; - } - - - public class MCurrencyAccount implements MethodAccount - { - private String name; - - public MCurrencyAccount(String name) - { - this.name = name; - } - - @Override - public double balance() - { - return CurrencyList.getValue((String)CurrencyList.maxCurrency(name)[0], name); - } - - @Override - public boolean set(double amount) - { - CurrencyList.setValue((String)CurrencyList.maxCurrency(name)[0], name, amount); - return true; - } - - @Override - public boolean add(double amount) - { - return CurrencyList.add(name, amount); - } - - @Override - public boolean subtract(double amount) - { - return CurrencyList.subtract(name, amount); - } - - @Override - public boolean multiply(double amount) - { - return CurrencyList.multiply(name, amount); - } - - @Override - public boolean divide(double amount) - { - return CurrencyList.divide(name, amount); - } - - @Override - public boolean hasEnough(double amount) - { - return CurrencyList.hasEnough(name, amount); - } - - @Override - public boolean hasOver(double amount) - { - return CurrencyList.hasOver(name, amount); - } - - @Override - public boolean hasUnder(double amount) - { - return CurrencyList.hasUnder(name, amount); - } - - @Override - public boolean isNegative() - { - return CurrencyList.isNegative(name); - } - - @Override - public boolean remove() - { - return CurrencyList.remove(name); - } - } -} diff --git a/Essentials/src/net/ess3/economy/register/methods/VaultEco.java b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java index a8476206d..d897ae3a6 100644 --- a/Essentials/src/net/ess3/economy/register/methods/VaultEco.java +++ b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java @@ -1,10 +1,10 @@ package net.ess3.economy.register.methods; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.RegisteredServiceProvider; import net.ess3.economy.register.Method; import net.milkbowl.vault.Vault; import net.milkbowl.vault.economy.Economy; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.RegisteredServiceProvider; public class VaultEco implements Method diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java index 0b7ee8023..a615ada5d 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo5.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java @@ -1,12 +1,12 @@ package net.ess3.economy.register.methods; -import org.bukkit.plugin.Plugin; 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 net.ess3.economy.register.Method; +import org.bukkit.plugin.Plugin; /** diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java index fe5f6159a..9dfdabe2e 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo6.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java @@ -1,11 +1,11 @@ package net.ess3.economy.register.methods; -import org.bukkit.plugin.Plugin; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; import com.iCo6.system.Holdings; import net.ess3.economy.register.Method; +import org.bukkit.plugin.Plugin; /** diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index 9dd429f45..8d3f380a7 100644 --- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -1,5 +1,8 @@ package net.ess3.listener; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.bukkit.BukkitMaterial; import org.bukkit.GameMode; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -8,9 +11,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.bukkit.BukkitMaterial; public class EssentialsBlockListener implements Listener diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 5f3182656..81ec8a397 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -1,6 +1,5 @@ package net.ess3.listener; -import static net.ess3.I18n._; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -8,6 +7,18 @@ import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.api.IUserMap; +import net.ess3.permissions.Permissions; +import net.ess3.settings.Commands; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; +import net.ess3.utils.FormatUtil; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.textreader.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Server; @@ -24,18 +35,6 @@ import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.api.IUserMap; -import net.ess3.permissions.Permissions; -import net.ess3.settings.Commands; -import net.ess3.user.UserData.TimestampType; -import net.ess3.utils.DateUtil; -import net.ess3.utils.FormatUtil; -import net.ess3.utils.LocationUtil; -import net.ess3.utils.Util; -import net.ess3.utils.textreader.*; public class EssentialsPlayerListener implements Listener diff --git a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java index f87573051..56e3add3d 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -1,12 +1,6 @@ package net.ess3.listener; import java.util.logging.Level; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.server.PluginDisableEvent; -import org.bukkit.event.server.PluginEnableEvent; -import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.api.IReload; import net.ess3.api.ISettings; @@ -15,6 +9,12 @@ import net.ess3.ranks.GMGroups; import net.ess3.ranks.RanksStorage; import net.ess3.ranks.VaultGroups; import net.ess3.settings.General; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.server.PluginDisableEvent; +import org.bukkit.event.server.PluginEnableEvent; +import org.bukkit.plugin.Plugin; public class EssentialsPluginListener implements Listener, IReload diff --git a/Essentials/src/net/ess3/metrics/Metrics.java b/Essentials/src/net/ess3/metrics/Metrics.java index bff2f7d01..b1149b52e 100644 --- a/Essentials/src/net/ess3/metrics/Metrics.java +++ b/Essentials/src/net/ess3/metrics/Metrics.java @@ -200,6 +200,7 @@ public class Metrics { private boolean firstPost = true; + @Override public void run() { try diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 6ce7f3948..17664ab61 100644 --- a/Essentials/src/net/ess3/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -1,15 +1,15 @@ package net.ess3.metrics; -import static net.ess3.I18n._; import java.util.logging.Level; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; +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 org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; public class MetricsListener implements Listener diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java index 8f8f4a90e..2c5314142 100644 --- a/Essentials/src/net/ess3/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -1,8 +1,8 @@ package net.ess3.metrics; -import static net.ess3.I18n._; import java.util.Locale; import java.util.logging.Level; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.economy.register.Method; @@ -20,8 +20,12 @@ public class MetricsStarter implements Runnable private enum Modules { Essentials, - EssentialsAntiCheat, + Essentials2Compat, EssentialsChat, + EssentialsExtra, + EssentialsSigns, + EssentialsUpdate, + EssentialsAntiBuild, EssentialsSpawn, EssentialsProtect, EssentialsGeoIP, @@ -55,7 +59,6 @@ public class MetricsStarter implements Runnable ess.getLogger().info(_("metrics4")); start = false; } - return; } } catch (Exception ex) diff --git a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java index b88136006..c846a88d2 100644 --- a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java +++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; import net.ess3.api.IPermission; import net.ess3.bukkit.PermissionFactory; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; public abstract class AbstractSuperpermsPermission implements IPermission diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 8006fca24..c4c1e19c7 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -1,10 +1,10 @@ package net.ess3.permissions; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; import net.ess3.api.IPermission; import net.ess3.bukkit.PermissionFactory; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission diff --git a/Essentials/src/net/ess3/ranks/AbstractRanks.java b/Essentials/src/net/ess3/ranks/AbstractRanks.java index b94e24cd1..a0ea29c62 100644 --- a/Essentials/src/net/ess3/ranks/AbstractRanks.java +++ b/Essentials/src/net/ess3/ranks/AbstractRanks.java @@ -1,10 +1,10 @@ package net.ess3.ranks; import java.text.MessageFormat; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.utils.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public abstract class AbstractRanks diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 2ec24e1c9..55a6295d3 100644 --- a/Essentials/src/net/ess3/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -1,13 +1,13 @@ package net.ess3.ranks; import java.util.logging.Level; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.Plugin; public class GMGroups extends AbstractRanks implements IRanks diff --git a/Essentials/src/net/ess3/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java index 5538415d8..d845a81c8 100644 --- a/Essentials/src/net/ess3/ranks/RanksStorage.java +++ b/Essentials/src/net/ess3/ranks/RanksStorage.java @@ -7,12 +7,12 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Map.Entry; -import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.ess3.permissions.Permissions; import net.ess3.storage.AsyncStorageObjectHolder; +import org.bukkit.command.CommandSender; public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRanks diff --git a/Essentials/src/net/ess3/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java index b294b6d5d..ef5d1b64a 100644 --- a/Essentials/src/net/ess3/ranks/VaultGroups.java +++ b/Essentials/src/net/ess3/ranks/VaultGroups.java @@ -1,12 +1,12 @@ package net.ess3.ranks; import java.util.logging.Level; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.RegisteredServiceProvider; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.milkbowl.vault.chat.Chat; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.RegisteredServiceProvider; public class VaultGroups extends AbstractRanks implements IRanks diff --git a/Essentials/src/net/ess3/settings/Jails.java b/Essentials/src/net/ess3/settings/Jails.java index bce7a80c5..6b49d1997 100644 --- a/Essentials/src/net/ess3/settings/Jails.java +++ b/Essentials/src/net/ess3/settings/Jails.java @@ -3,11 +3,11 @@ package net.ess3.settings; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.bukkit.Location; import lombok.*; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; import net.ess3.storage.StoredLocation; +import org.bukkit.Location; @Data diff --git a/Essentials/src/net/ess3/settings/Kit.java b/Essentials/src/net/ess3/settings/Kit.java index 58e7930e0..f3a14ae51 100644 --- a/Essentials/src/net/ess3/settings/Kit.java +++ b/Essentials/src/net/ess3/settings/Kit.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.bukkit.inventory.ItemStack; import lombok.*; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; +import org.bukkit.inventory.ItemStack; @Data diff --git a/Essentials/src/net/ess3/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java index 392350820..f68ac5d83 100644 --- a/Essentials/src/net/ess3/settings/Kits.java +++ b/Essentials/src/net/ess3/settings/Kits.java @@ -4,11 +4,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; import lombok.*; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; @Data diff --git a/Essentials/src/net/ess3/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java index f59cdac1a..7d05d55d2 100644 --- a/Essentials/src/net/ess3/settings/Spawns.java +++ b/Essentials/src/net/ess3/settings/Spawns.java @@ -3,12 +3,12 @@ package net.ess3.settings; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.bukkit.Location; import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; import net.ess3.storage.StoredLocation; +import org.bukkit.Location; @Data diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 9588f7200..1c310c7c3 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -1,19 +1,10 @@ package net.ess3.settings; -import static net.ess3.I18n._; import java.io.File; import java.util.Locale; import java.util.Map; import java.util.logging.Level; -import org.bukkit.*; -import org.bukkit.event.Event; -import org.bukkit.event.EventException; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.plugin.EventExecutor; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.ISettings; @@ -24,6 +15,15 @@ import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.SimpleTextInput; import net.ess3.utils.textreader.SimpleTextPager; +import org.bukkit.*; +import org.bukkit.event.Event; +import org.bukkit.event.EventException; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.plugin.EventExecutor; public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IEssentialsModule diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java index deb06bd39..e49ebb181 100644 --- a/Essentials/src/net/ess3/settings/WorldOptions.java +++ b/Essentials/src/net/ess3/settings/WorldOptions.java @@ -2,10 +2,10 @@ package net.ess3.settings; import java.util.EnumMap; import java.util.Map; -import org.bukkit.entity.EntityType; import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.StorageObject; +import org.bukkit.entity.EntityType; @Data diff --git a/Essentials/src/net/ess3/settings/antibuild/Alert.java b/Essentials/src/net/ess3/settings/antibuild/Alert.java index 6ce34e9e1..481cc39ec 100644 --- a/Essentials/src/net/ess3/settings/antibuild/Alert.java +++ b/Essentials/src/net/ess3/settings/antibuild/Alert.java @@ -3,11 +3,11 @@ package net.ess3.settings.antibuild; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.bukkit.Material; import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; +import org.bukkit.Material; @Data diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java index c058b9be4..af9205f7e 100644 --- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java +++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java @@ -3,11 +3,11 @@ package net.ess3.settings.antibuild; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.bukkit.Material; import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; +import org.bukkit.Material; @Data diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index 436808e09..b38f5750b 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -5,8 +5,8 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.logging.Level; -import org.bukkit.Bukkit; import net.ess3.api.IEssentials; +import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> implements Runnable diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 8ab5edcac..2a74c4cd5 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -5,8 +5,8 @@ import java.io.FileNotFoundException; import java.io.PrintWriter; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import org.bukkit.Bukkit; import net.ess3.api.IEssentials; +import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileWriter implements Runnable diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index 81bf3e6c6..d4239db8e 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -4,8 +4,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; -import org.bukkit.Bukkit; import net.ess3.api.IEssentials; +import org.bukkit.Bukkit; public abstract class AsyncStorageObjectHolder<T extends StorageObject> implements IStorageObjectHolder<T> diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 962d91c6c..89f20cdf8 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -5,14 +5,13 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; - +import net.ess3.Essentials; +import net.ess3.api.IPlugin; import net.ess3.utils.Util; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; -import net.ess3.Essentials; -import net.ess3.api.IPlugin; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index cf2abd6d9..0c3def687 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -1,6 +1,5 @@ package net.ess3.storage; -import static net.ess3.I18n._; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -11,8 +10,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.logging.Level; -import org.bukkit.Bukkit; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; +import org.bukkit.Bukkit; public class ManagedFile diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index f1872c24d..bb7894b51 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -1,5 +1,9 @@ package net.ess3.storage; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.util.concurrent.UncheckedExecutionException; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -12,10 +16,6 @@ import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.regex.Pattern; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.util.concurrent.UncheckedExecutionException; import net.ess3.api.IEssentials; import net.ess3.api.InvalidNameException; import net.ess3.utils.Util; diff --git a/Essentials/src/net/ess3/user/Inventory.java b/Essentials/src/net/ess3/user/Inventory.java index fdd523eec..fa75cec75 100644 --- a/Essentials/src/net/ess3/user/Inventory.java +++ b/Essentials/src/net/ess3/user/Inventory.java @@ -2,12 +2,12 @@ package net.ess3.user; import java.util.HashMap; import java.util.Map; -import org.bukkit.inventory.ItemStack; import lombok.Data; import lombok.EqualsAndHashCode; import net.ess3.storage.MapKeyType; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; +import org.bukkit.inventory.ItemStack; @Data diff --git a/Essentials/src/net/ess3/user/TooManyMatchesException.java b/Essentials/src/net/ess3/user/TooManyMatchesException.java index f5911a746..0b0036fbd 100644 --- a/Essentials/src/net/ess3/user/TooManyMatchesException.java +++ b/Essentials/src/net/ess3/user/TooManyMatchesException.java @@ -1,8 +1,8 @@ package net.ess3.user; -import static net.ess3.I18n._; import java.util.Collections; import java.util.Set; +import static net.ess3.I18n._; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 17b7b5b3d..65713f872 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -1,20 +1,15 @@ package net.ess3.user; -import static net.ess3.I18n._; import java.lang.ref.WeakReference; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; 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.craftbukkit.InventoryWorkaround; @@ -22,6 +17,11 @@ import net.ess3.economy.register.Method; import net.ess3.permissions.Permissions; import net.ess3.utils.DateUtil; import net.ess3.utils.FormatUtil; +import org.bukkit.Location; +import org.bukkit.OfflinePlayer; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; diff --git a/Essentials/src/net/ess3/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java index 90ee40138..bcec3c850 100644 --- a/Essentials/src/net/ess3/user/UserBase.java +++ b/Essentials/src/net/ess3/user/UserBase.java @@ -4,15 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Set; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionAttachment; -import org.bukkit.permissions.PermissionAttachmentInfo; -import org.bukkit.plugin.Plugin; import lombok.Delegate; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; @@ -23,6 +14,15 @@ import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.storage.IStorageObjectHolder; import net.ess3.storage.StoredLocation.WorldNotLoadedException; import net.ess3.utils.Util; +import org.bukkit.Location; +import org.bukkit.OfflinePlayer; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.permissions.Permission; +import org.bukkit.permissions.PermissionAttachment; +import org.bukkit.permissions.PermissionAttachmentInfo; +import org.bukkit.plugin.Plugin; public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implements OfflinePlayer, CommandSender, IStorageObjectHolder<UserData> diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java index a25775333..4e080ba34 100644 --- a/Essentials/src/net/ess3/user/UserData.java +++ b/Essentials/src/net/ess3/user/UserData.java @@ -1,12 +1,12 @@ package net.ess3.user; import java.util.*; -import org.bukkit.Location; -import org.bukkit.Material; import lombok.*; import net.ess3.storage.*; +import org.bukkit.Location; +import org.bukkit.Material; - +//maybe replace HashSets/HashMaps with Enums @Data @EqualsAndHashCode(callSuper = false) public class UserData implements StorageObject diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java index d9adfaead..c83047f0c 100644 --- a/Essentials/src/net/ess3/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -1,16 +1,16 @@ package net.ess3.user; -import static net.ess3.I18n._; import java.io.File; import java.util.*; import java.util.regex.Pattern; -import org.bukkit.entity.Player; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.api.InvalidNameException; import net.ess3.storage.StorageObjectMap; import net.ess3.utils.FormatUtil; +import org.bukkit.entity.Player; public class UserMap extends StorageObjectMap<IUser> implements IUserMap diff --git a/Essentials/src/net/ess3/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java index bcc8824c3..2a38fd7a4 100644 --- a/Essentials/src/net/ess3/utils/DateUtil.java +++ b/Essentials/src/net/ess3/utils/DateUtil.java @@ -1,10 +1,10 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static net.ess3.I18n._; public class DateUtil diff --git a/Essentials/src/net/ess3/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java index 463566fc9..7fc3d901b 100644 --- a/Essentials/src/net/ess3/utils/DescParseTickFormat.java +++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java @@ -1,8 +1,8 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.text.SimpleDateFormat; import java.util.*; +import static net.ess3.I18n._; /** diff --git a/Essentials/src/net/ess3/utils/FormatUtil.java b/Essentials/src/net/ess3/utils/FormatUtil.java index 38f1d5541..4cba2a71b 100644 --- a/Essentials/src/net/ess3/utils/FormatUtil.java +++ b/Essentials/src/net/ess3/utils/FormatUtil.java @@ -1,10 +1,10 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; import java.util.regex.Pattern; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index fffd7abca..5d2af4000 100644 --- a/Essentials/src/net/ess3/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -1,7 +1,7 @@ package net.ess3.utils; -import static net.ess3.I18n._; import java.util.*; +import static net.ess3.I18n._; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index c633f5f4b..0817448bd 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -3,12 +3,12 @@ package net.ess3.utils; import java.util.Collection; import java.util.Locale; import java.util.regex.Pattern; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.inventory.ItemStack; import net.ess3.api.InvalidNameException; import net.ess3.utils.gnu.inet.encoding.Punycode; import net.ess3.utils.gnu.inet.encoding.PunycodeException; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.inventory.ItemStack; public final class Util diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index 36322c123..e6510a2e3 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -1,16 +1,16 @@ package net.ess3.utils.textreader; -import static net.ess3.I18n._; import java.io.IOException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; +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 org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; public class HelpInput implements IText diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index 70261c577..0781ea48a 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -5,14 +5,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.utils.DescParseTickFormat; import net.ess3.utils.FormatUtil; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.utils.DescParseTickFormat; public class KeywordReplacer implements IText @@ -34,7 +34,7 @@ public class KeywordReplacer implements IText String displayName, ipAddress, balance, mails, world; String worlds, online, unique, playerlist, date, time; String worldTime12, worldTime24, worldDate, plugins; - String userName, address, version; + String userName, address, version; //unused? if (sender instanceof IUser) { final IUser user = (IUser)sender; diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index 037dadc03..ca38cd528 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -4,11 +4,11 @@ import java.io.*; import java.lang.ref.SoftReference; import java.util.*; import java.util.logging.Level; -import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.InvalidNameException; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; public class TextInput implements IText diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index ade5ad310..88f00125c 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -1,11 +1,11 @@ package net.ess3.utils.textreader; -import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.Map; -import org.bukkit.command.CommandSender; import net.ess3.I18n; +import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; public class TextPager diff --git a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java index d625586cd..4d61e6b3d 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java @@ -1,11 +1,11 @@ package com.earth2me.essentials; import java.io.File; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IItemDb; import net.ess3.api.IPlugin; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; public class Essentials extends JavaPlugin diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 45f7b8a29..073f45bf5 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java @@ -310,6 +310,7 @@ public class EssentialsConf extends YamlConfiguration set(path, map); } + @Override public long getLong(final String path, final long def) { try diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java index 406a1a540..221d94414 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java @@ -1,20 +1,20 @@ package com.earth2me.essentials; -import static net.ess3.I18n._; import java.io.File; import java.text.MessageFormat; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.event.EventPriority; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IEssentials; -public class Settings implements ISettings +public final class Settings implements ISettings { private final transient EssentialsConf config; private final static Logger logger = Logger.getLogger("Minecraft"); diff --git a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java index 957ed9777..c53400efd 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java @@ -1,14 +1,14 @@ package com.earth2me.essentials; +import com.google.common.io.PatternFilenameFilter; import java.io.File; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.logging.Level; -import org.bukkit.Material; -import com.google.common.io.PatternFilenameFilter; import net.ess3.api.*; import net.ess3.user.User; +import org.bukkit.Material; class UpdateUserFiles diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java index 078535293..7052ffbca 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java @@ -2,12 +2,12 @@ package com.earth2me.essentials; import java.io.File; import java.util.*; +import net.ess3.api.IEssentials; +import net.ess3.storage.StoredLocation; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.inventory.ItemStack; -import net.ess3.api.IEssentials; -import net.ess3.storage.StoredLocation; public class UserData @@ -581,7 +581,7 @@ public class UserData return lastLogin; } - private void _setLastLogin(long time) + private void _setLastLogin(long time) //unused method { lastLogin = time; config.setProperty("timestamps.login", time); @@ -619,7 +619,7 @@ public class UserData return lastLoginAddress; } - private void _setLastLoginAddress(String address) + private void _setLastLoginAddress(String address) //unused method { lastLoginAddress = address; config.setProperty("ipAddress", address); @@ -651,7 +651,7 @@ public class UserData return ret; } - private boolean newplayer; + private boolean newplayer; //unused variable private String geolocation; private String _getGeoLocation() diff --git a/Essentials2Compat/src/com/earth2me/essentials/Util.java b/Essentials2Compat/src/com/earth2me/essentials/Util.java index 1bdc878bb..0500df536 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Util.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Util.java @@ -4,7 +4,6 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Collection; import java.util.Locale; -import java.util.logging.Logger; import java.util.regex.Pattern; @@ -14,7 +13,6 @@ public class Util { } - private final static Logger logger = Logger.getLogger("Minecraft"); private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]"); private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]"); diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java index bfd26152e..b80d38f6d 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java @@ -1,19 +1,19 @@ package net.ess3.chat; -import static net.ess3.I18n._; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; public class EssentialsChat extends JavaPlugin diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index 4c76e2185..e358cf9e1 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -1,18 +1,18 @@ package net.ess3.chat; -import static net.ess3.I18n._; import java.text.MessageFormat; import java.util.Locale; import java.util.Map; import java.util.logging.Logger; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; +import static net.ess3.I18n._; import net.ess3.api.*; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.event.Listener; +import org.bukkit.event.player.AsyncPlayerChatEvent; public abstract class EssentialsChatPlayer implements Listener diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java index c335d2300..b6b93c0bf 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -1,6 +1,8 @@ package net.ess3.chat; import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; @@ -8,8 +10,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; public class EssentialsLocalChatEventListener implements Listener diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java index 628b5f056..56e29060e 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java @@ -1,13 +1,13 @@ package net.ess3.chat.listenerlevel; import java.util.Map; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index df823461e..18754dd7d 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -1,14 +1,14 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import org.bukkit.Server; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.AsyncPlayerChatEvent; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.chat.ChatStore; import net.ess3.chat.EssentialsChatPlayer; +import org.bukkit.Server; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.AsyncPlayerChatEvent; public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index bc2572ad1..bffc0ce22 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,13 +1,13 @@ package net.ess3.chat.listenerlevel; import java.util.Map; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer diff --git a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java index 93831ef19..39aec1c0a 100644 --- a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java +++ b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java @@ -12,6 +12,9 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; +import net.ess3.api.IEssentials; +import net.ess3.bukkit.BukkitPlugin; +import net.ess3.commands.EssentialsCommandHandler; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; @@ -20,9 +23,6 @@ import org.bukkit.command.TabExecutor; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; import org.bukkit.plugin.java.JavaPlugin; -import net.ess3.api.IEssentials; -import net.ess3.bukkit.BukkitPlugin; -import net.ess3.commands.EssentialsCommandHandler; public class EssentialsExtra extends JavaPlugin diff --git a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java index cc947ead2..a6173a243 100644 --- a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java +++ b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java @@ -2,12 +2,12 @@ package net.ess3.extra.commands; import java.util.Random; -import org.bukkit.Location; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Ocelot; import net.ess3.api.IUser; import net.ess3.commands.EssentialsCommand; import net.ess3.extra.AnnotatedCommand; +import org.bukkit.Location; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Ocelot; @AnnotatedCommand(description = "Throw an exploding kitten at your opponent", usage = "/<command>") diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java index e6e00ad6d..b91f6740e 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java @@ -1,11 +1,11 @@ package net.ess3.protect; -import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.plugin.Plugin; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.bukkit.BukkitPlugin; +import org.bukkit.plugin.Plugin; public class EssentialsConnect diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java index 0e1b75a7e..4fa71139b 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java @@ -8,7 +8,7 @@ import org.bukkit.event.entity.*; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityTargetEvent.TargetReason; - +//TODO: remove unnecessary return statements public class EssentialsProtectEntityListener implements Listener { private final transient IProtect prot; @@ -143,7 +143,7 @@ public class EssentialsProtectEntityListener implements Listener } } } - + // return statements are probably not needed here @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityExplode(final EntityExplodeEvent event) { diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index 7ab2c0ea5..7cacd741f 100644 --- a/EssentialsProtect/src/net/ess3/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -1,11 +1,11 @@ package net.ess3.protect; import java.util.Locale; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; import net.ess3.api.IPermission; import net.ess3.bukkit.PermissionFactory; import net.ess3.permissions.DotStarPermission; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 7333a7414..9b143a8a5 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,9 +1,15 @@ package net.ess3.signs; -import static net.ess3.I18n._; import java.util.HashSet; import java.util.Locale; import java.util.Set; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.signs.signs.SignException; +import net.ess3.utils.FormatUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -11,12 +17,6 @@ import org.bukkit.block.Sign; import org.bukkit.entity.Player; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.inventory.ItemStack; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.signs.signs.SignException; -import net.ess3.utils.FormatUtil; public class EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index 2ac464f88..cdd4494ea 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -1,16 +1,16 @@ package net.ess3.signs; -import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Bukkit; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; +import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.signs.listeners.SignBlockListener; import net.ess3.signs.listeners.SignEntityListener; import net.ess3.signs.listeners.SignPlayerListener; +import org.bukkit.Bukkit; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java index 159e85d4a..52972e9cd 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java @@ -1,13 +1,13 @@ package net.ess3.signs.signs; -import static net.ess3.I18n._; import java.util.Locale; -import org.bukkit.GameMode; +import static net.ess3.I18n._; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; +import org.bukkit.GameMode; public class SignGameMode extends EssentialsSign diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java index b2da16187..a4629ce14 100644 --- a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java @@ -3,16 +3,16 @@ package net.ess3.update; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import net.ess3.update.chat.*; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; -import net.ess3.update.chat.*; public class EssentialsHelp implements Listener @@ -154,8 +154,9 @@ public class EssentialsHelp implements Listener ircBot = new IrcBot(player, "Ess_" + player.getName(), UsernameUtil.createUsername(player)); } + //Todo: make sure this is threadsafe @EventHandler - public void onPlayerChat(final PlayerChatEvent event) + public void onPlayerChat(final AsyncPlayerChatEvent event) { if (event.getPlayer() == chatUser) { diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index 901696a14..8e8b3e7ed 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -49,7 +49,7 @@ public class UpdateCheck public void scheduleUpdateTask() { - plugin.getServer().getScheduler().scheduleAsyncRepeatingTask( + plugin.getServer().getScheduler().scheduleAsyncRepeatingTask( //should probably not be async plugin, new Runnable() { @Override diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java index 7a44a2ade..a369ad44e 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java @@ -53,7 +53,6 @@ public class UpdateFile catch (Exception ex) { LOGGER.log(Level.SEVERE, "Could not load update.yml!"); - return; } } diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java index 774dd4ac1..0e9f59283 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java @@ -1,18 +1,18 @@ package net.ess3.update; import java.util.logging.Level; +import net.ess3.update.states.InstallationFinishedEvent; +import net.ess3.update.states.StateMachine; +import net.ess3.update.tasks.SelfUpdate; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.Plugin; -import net.ess3.update.states.InstallationFinishedEvent; -import net.ess3.update.states.StateMachine; -import net.ess3.update.tasks.SelfUpdate; // TODO: This whole thing should make use of the conversations api @@ -96,9 +96,9 @@ public class UpdateProcess implements Listener { UpdateProcess.this.currentPlayer = null; } - + //TODO: make sure this is threadsafe @EventHandler(priority = EventPriority.LOWEST) - public void onPlayerChat(final PlayerChatEvent event) + public void onPlayerChat(final AsyncPlayerChatEvent event) { if (event.getPlayer() == currentPlayer) { @@ -113,7 +113,6 @@ public class UpdateProcess implements Listener startWork(); } event.setCancelled(true); - return; } } diff --git a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java index d01d0790f..fff363835 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java @@ -2,8 +2,8 @@ package net.ess3.update.chat; import java.io.*; import java.nio.charset.Charset; -import org.bukkit.plugin.Plugin; import net.ess3.update.PastieUpload; +import org.bukkit.plugin.Plugin; public abstract class AbstractFileCommand implements Command diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index ba202c1ff..783ba19a1 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java @@ -1,7 +1,7 @@ package net.ess3.update.states; -import org.bukkit.entity.Player; import net.ess3.update.AbstractWorkListener; +import org.bukkit.entity.Player; public abstract class AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java index 033106041..eccc4548a 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java +++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java @@ -1,9 +1,9 @@ package net.ess3.update.states; import java.util.List; -import org.bukkit.entity.Player; import net.ess3.update.UpdateCheck; import net.ess3.update.VersionInfo; +import org.bukkit.entity.Player; public class Changelog extends AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java index 9fa9d763c..a62735f5e 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java @@ -1,10 +1,10 @@ package net.ess3.update.states; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; public class EssentialsChat extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java index 7ac34fa22..6d91a0cb9 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java @@ -1,10 +1,10 @@ package net.ess3.update.states; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; public class EssentialsGeoIP extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java index e2c33cd9b..bdc9984a2 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java @@ -1,10 +1,10 @@ package net.ess3.update.states; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; public class EssentialsProtect extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index 76bfec87e..c9dbb1f6a 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -1,11 +1,11 @@ package net.ess3.update.states; import java.util.Iterator; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.UpdateCheck; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.UpdateCheck; public class StateMachine extends AbstractWorkListener implements Runnable @@ -90,7 +90,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable public void startWork() { iterator = states.values().iterator(); - Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), this); + Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), this); //Should this be async? (method deprecated) } @Override @@ -149,7 +149,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable { StateMachine.this.player.sendMessage(message); } - Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), StateMachine.this); + Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), StateMachine.this); //Should this be async? (method deprecated) } }); } diff --git a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java index 4a4b9e862..bc043c6de 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java +++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java @@ -1,7 +1,7 @@ package net.ess3.update.states; -import org.bukkit.entity.Player; import net.ess3.update.UpdateCheck; +import org.bukkit.entity.Player; public class UpdateOrInstallation extends AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java index c6df0cae7..82e906d90 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java @@ -3,11 +3,11 @@ package net.ess3.update.tasks; import java.io.File; import java.net.URL; import java.util.logging.Level; -import org.bukkit.Bukkit; import net.ess3.update.AbstractWorkListener; import net.ess3.update.GetFile; import net.ess3.update.ModuleInfo; import net.ess3.update.VersionInfo; +import org.bukkit.Bukkit; public class InstallModule implements Runnable, Task @@ -31,7 +31,7 @@ public class InstallModule implements Runnable, Task @Override public void start() { - Bukkit.getScheduler().scheduleAsyncDelayedTask(listener.getPlugin(), this); + Bukkit.getScheduler().scheduleAsyncDelayedTask(listener.getPlugin(), this); //Should this be async? (method deprecated) } @Override @@ -55,7 +55,6 @@ public class InstallModule implements Runnable, Task { Bukkit.getLogger().log(Level.SEVERE, "Failed to download module " + moduleName + " to " + fileName, ex); listener.onWorkAbort("An error occured, please check your server log."); - return; } } } diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java index 2ff6da55c..31d45e741 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java @@ -1,7 +1,7 @@ package net.ess3.update.tasks; -import org.bukkit.Bukkit; import net.ess3.update.AbstractWorkListener; +import org.bukkit.Bukkit; public class SelfUpdate extends AbstractWorkListener implements Task, Runnable @@ -44,7 +44,7 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable @Override public void run() { - Bukkit.getScheduler().scheduleAsyncDelayedTask( + Bukkit.getScheduler().scheduleAsyncDelayedTask( //Should this be async? (method deprecated) getPlugin(), new Runnable() { @Override diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java index 05106145e..68609207d 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java @@ -1,9 +1,9 @@ package net.ess3.xmpp; -import org.bukkit.command.CommandSender; import net.ess3.Console; import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; +import org.bukkit.command.CommandSender; public class Commandxmpp extends EssentialsCommand diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java index 0be64d91a..ca78962f6 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java @@ -1,10 +1,10 @@ package net.ess3.xmpp; import java.util.List; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandxmppspy extends EssentialsCommand diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index d7241d57b..fbfbbf56a 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -1,19 +1,19 @@ package net.ess3.xmpp; -import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IPlugin; +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommandHandler; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import net.ess3.api.IEssentials; -import net.ess3.api.IPlugin; -import net.ess3.api.IUser; -import net.ess3.commands.EssentialsCommandHandler; public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index c2cd8428d..85676198c 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -1,14 +1,14 @@ package net.ess3.xmpp; +import net.ess3.api.IEssentials; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import net.ess3.api.IEssentials; - +//TODO: port 2.9 changes and verify thread safety. class EssentialsXMPPPlayerListener implements Listener { private final transient IEssentials ess; @@ -26,7 +26,7 @@ class EssentialsXMPPPlayerListener implements Listener } @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerChat(final PlayerChatEvent event) + public void onPlayerChat(final AsyncPlayerChatEvent event) { sendMessageToSpyUsers(String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage())); } diff --git a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java index a464dc398..789ccddc9 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java @@ -1,9 +1,9 @@ package net.ess3.xmpp; import java.util.List; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; -import net.ess3.api.IUser; public interface IEssentialsXMPP extends Plugin diff --git a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java index 56da0d7e7..c80680445 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java @@ -5,8 +5,8 @@ import java.io.IOException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.configuration.file.YamlConfiguration; import net.ess3.api.IReload; +import org.bukkit.configuration.file.YamlConfiguration; public class UserManager implements IReload diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index 740046894..a04ab25d9 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -3,13 +3,11 @@ package net.ess3.xmpp; import java.io.File; import java.util.*; import java.util.logging.*; - -import com.avaje.ebeaninternal.server.transaction.log.SimpleLogger; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; import net.ess3.api.IReload; import net.ess3.api.IUser; import net.ess3.utils.FormatUtil; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; import org.jivesoftware.smack.*; import org.jivesoftware.smack.Roster.SubscriptionMode; import org.jivesoftware.smack.packet.Message; |