TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-09-28 12:53:04 +00:00
Code Issues Projects Releases Wiki Activity

Clean Imports

Browse source
This commit is contained in:
KHobbits 2013-10-11 03:44:41 +01:00
parent 9e20f556e1
commit 59b501b2b1
75 changed files with 150 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.command.PluginCommandYamlParser; import org.bukkit.command.PluginCommandYamlParser;

2
Essentials/src/com/earth2me/essentials/Backup.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

8
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -17,11 +17,7 @@
*/ */
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.ISettings;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.Economy;
import net.ess3.api.IJails;
import com.earth2me.essentials.commands.EssentialsCommand; import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.commands.NoChargeException;
@ -48,7 +44,11 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.Economy;
import net.ess3.api.IEssentials;
import net.ess3.api.IItemDb; import net.ess3.api.IItemDb;
import net.ess3.api.IJails;
import net.ess3.api.ISettings;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Server; import org.bukkit.Server;

2
Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.LocationUtil; import com.earth2me.essentials.utils.LocationUtil;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IEssentials;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;

19
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View file

@ -1,8 +1,6 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.InvalidWorldException;
import com.google.common.io.Files; import com.google.common.io.Files;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -20,6 +18,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.InvalidWorldException;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -117,15 +116,17 @@ public class EssentialsConf extends YamlConfiguration
try try
{ {
long startSize = configFile.length(); long startSize = configFile.length();
if (startSize > Integer.MAX_VALUE) { if (startSize > Integer.MAX_VALUE)
{
throw new InvalidConfigurationException("File too big"); throw new InvalidConfigurationException("File too big");
} }
ByteBuffer buffer = ByteBuffer.allocate((int)startSize); ByteBuffer buffer = ByteBuffer.allocate((int)startSize);
int length; int length;
while ((length = inputStream.read(bytebuffer)) != -1) while ((length = inputStream.read(bytebuffer)) != -1)
{ {
if (length > buffer.remaining()) { if (length > buffer.remaining())
ByteBuffer resize = ByteBuffer.allocate(buffer.capacity()+length-buffer.remaining()); {
ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
int resizePosition = buffer.position(); int resizePosition = buffer.position();
buffer.rewind(); buffer.rewind();
resize.put(buffer); resize.put(buffer);
@ -495,7 +496,7 @@ public class EssentialsConf extends YamlConfiguration
{ {
return get(path); return get(path);
} }
public void setProperty(final String path, final BigDecimal bigDecimal) public void setProperty(final String path, final BigDecimal bigDecimal)
{ {
set(path, bigDecimal.toString()); set(path, bigDecimal.toString());
@ -522,14 +523,13 @@ public class EssentialsConf extends YamlConfiguration
{ {
return super.get(path, def); return super.get(path, def);
} }
public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def) public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def)
{ {
final String input = super.getString(path); final String input = super.getString(path);
return toBigDecimal(input, def); return toBigDecimal(input, def);
} }
public static BigDecimal toBigDecimal(final String input, final BigDecimal def) public static BigDecimal toBigDecimal(final String input, final BigDecimal def)
{ {
if (input == null || input.isEmpty()) if (input == null || input.isEmpty())
@ -809,5 +809,4 @@ public class EssentialsConf extends YamlConfiguration
{ {
super.set(path, value); super.set(path, value);
} }
} }

18
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -105,14 +105,14 @@ public class EssentialsEntityListener implements Listener
{ {
ess.scheduleSyncDelayedTask( ess.scheduleSyncDelayedTask(
new Runnable() new Runnable()
{ {
@Override @Override
public void run() public void run()
{ {
attacker.getServer().dispatchCommand(attacker.getBase(), command); attacker.getServer().dispatchCommand(attacker.getBase(), command);
LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command)); LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
} }
}); });
event.setCancelled(true); event.setCancelled(true);
return; return;

9
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.KeywordReplacer;
@ -14,10 +13,10 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -26,8 +25,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
@ -297,7 +296,7 @@ public class EssentialsPlayerListener implements Listener
user.setCompassTarget(updateLoc); user.setCompassTarget(updateLoc);
} }
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerLogin2(final PlayerLoginEvent event) public void onPlayerLogin2(final PlayerLoginEvent event)
{ {
@ -308,7 +307,7 @@ public class EssentialsPlayerListener implements Listener
default: default:
return; return;
} }
final String banReason = _("banFormat", _("defaultBanReason"), "Console"); final String banReason = _("banFormat", _("defaultBanReason"), "Console");
event.disallow(Result.KICK_BANNED, banReason); event.disallow(Result.KICK_BANNED, banReason);
} }

2
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.perm.PermissionsHandler; import com.earth2me.essentials.perm.PermissionsHandler;
import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;

2
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
View file

@ -1,11 +1,10 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.craftbukkit.FakeWorld; import com.earth2me.essentials.craftbukkit.FakeWorld;
import com.earth2me.essentials.settings.Spawns; import com.earth2me.essentials.settings.Spawns;
import com.earth2me.essentials.storage.YamlStorageWriter; import com.earth2me.essentials.storage.YamlStorageWriter;
import com.earth2me.essentials.utils.StringUtil;
import java.io.*; import java.io.*;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.DigestInputStream; import java.security.DigestInputStream;
@ -13,6 +12,7 @@ import java.security.MessageDigest;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

2
Essentials/src/com/earth2me/essentials/I18n.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -12,6 +11,7 @@ import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.IEssentials;
public class I18n implements net.ess3.api.II18n public class I18n implements net.ess3.api.II18n

4
Essentials/src/com/earth2me/essentials/ItemDb.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

4
Essentials/src/com/earth2me/essentials/Jails.java
View file

@ -1,13 +1,13 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;

4
Essentials/src/com/earth2me/essentials/Kit.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import static com.earth2me.essentials.I18n.capitalCase; import static com.earth2me.essentials.I18n.capitalCase;
import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.Trade.OverflowType;
@ -9,11 +8,12 @@ import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.SimpleTextInput; import com.earth2me.essentials.textreader.SimpleTextInput;
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.NumberUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
Essentials/src/com/earth2me/essentials/ManagedFile.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.io.*; import java.io.*;
import java.math.BigInteger; import java.math.BigInteger;
@ -12,6 +11,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Essentials/src/com/earth2me/essentials/MetaItemStack.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.textreader.BookInput; import com.earth2me.essentials.textreader.BookInput;
import com.earth2me.essentials.textreader.BookPager; import com.earth2me.essentials.textreader.BookPager;
@ -9,6 +8,7 @@ import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.IEssentials;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect;

2
Essentials/src/com/earth2me/essentials/Mob.java
View file

@ -9,7 +9,6 @@ import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
// Suffixes can be appended on the end of a mob name to make it plural // Suffixes can be appended on the end of a mob name to make it plural
@ -131,6 +130,7 @@ public enum Mob
return bukkitMap.get(type); return bukkitMap.get(type);
} }
public static class MobException extends Exception public static class MobException extends Exception
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

27
Essentials/src/com/earth2me/essentials/MobData.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.StringUtil;
import java.util.*; import java.util.*;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.earth2me.essentials.utils.StringUtil;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Ageable; import org.bukkit.entity.Ageable;
@ -38,13 +38,10 @@ public enum MobData
BABY_SHEEP("lamb", EntityType.SHEEP, Data.BABY, false), BABY_SHEEP("lamb", EntityType.SHEEP, Data.BABY, false),
BABY_COW("calf", EntityType.COW.getEntityClass(), Data.BABY, false), BABY_COW("calf", EntityType.COW.getEntityClass(), Data.BABY, false),
BABY_VILLAGER("child", EntityType.VILLAGER, Data.BABY, false), BABY_VILLAGER("child", EntityType.VILLAGER, Data.BABY, false),
TAMED_TAMEABLE("tamed", Tameable.class, Data.TAMED, true), TAMED_TAMEABLE("tamed", Tameable.class, Data.TAMED, true),
TAME_TAMEABLE("tame", Tameable.class, Data.TAMED, false), TAME_TAMEABLE("tame", Tameable.class, Data.TAMED, false),
RANDOM_SHEEP("random", EntityType.SHEEP, Data.COLORABLE, true), RANDOM_SHEEP("random", EntityType.SHEEP, Data.COLORABLE, true),
COLORABLE_SHEEP("", StringUtil.joinList(DyeColor.values()).toLowerCase(Locale.ENGLISH), EntityType.SHEEP, Data.COLORABLE, true), COLORABLE_SHEEP("", StringUtil.joinList(DyeColor.values()).toLowerCase(Locale.ENGLISH), EntityType.SHEEP, Data.COLORABLE, true),
DONKEY_HORSE("donkey", EntityType.HORSE, Horse.Variant.DONKEY, true), DONKEY_HORSE("donkey", EntityType.HORSE, Horse.Variant.DONKEY, true),
MULE_HORSE("mule", EntityType.HORSE, Horse.Variant.MULE, true), MULE_HORSE("mule", EntityType.HORSE, Horse.Variant.MULE, true),
SKELETON_HORSE("skeleton", EntityType.HORSE, Horse.Variant.SKELETON_HORSE, true), SKELETON_HORSE("skeleton", EntityType.HORSE, Horse.Variant.SKELETON_HORSE, true),
@ -77,7 +74,6 @@ public enum MobData
GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, Material.GOLD_BARDING, true), GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, Material.GOLD_BARDING, true),
DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, Material.DIAMOND_BARDING, true), DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, Material.DIAMOND_BARDING, true),
ARMOR_HORSE("armor", EntityType.HORSE, Material.IRON_BARDING, true), ARMOR_HORSE("armor", EntityType.HORSE, Material.IRON_BARDING, true),
SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true), SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true),
WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false), WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false),
RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true), RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true),
@ -85,42 +81,35 @@ public enum MobData
TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false), TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true), BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true),
TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false), TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false),
VILLAGER_ZOMBIE("villager", EntityType.ZOMBIE.getEntityClass(), Data.VILLAGER, true), VILLAGER_ZOMBIE("villager", EntityType.ZOMBIE.getEntityClass(), Data.VILLAGER, true),
BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true), BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true), DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), Material.GOLD_SWORD, true), GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), Material.GOLD_SWORD, true),
IRON_SWORD_ZOMBIE("ironsword", EntityType.ZOMBIE.getEntityClass(), Material.IRON_SWORD, true), IRON_SWORD_ZOMBIE("ironsword", EntityType.ZOMBIE.getEntityClass(), Material.IRON_SWORD, true),
STONE_SWORD_ZOMBIE("stonesword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, false), STONE_SWORD_ZOMBIE("stonesword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, false),
SWORD_ZOMBIE("sword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, true), SWORD_ZOMBIE("sword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, true),
DIAMOND_SWORD_SKELETON("diamondsword", EntityType.SKELETON, Material.DIAMOND_SWORD, true), DIAMOND_SWORD_SKELETON("diamondsword", EntityType.SKELETON, Material.DIAMOND_SWORD, true),
GOLD_SWORD_SKELETON("goldsword", EntityType.SKELETON, Material.GOLD_SWORD, true), GOLD_SWORD_SKELETON("goldsword", EntityType.SKELETON, Material.GOLD_SWORD, true),
IRON_SWORD_SKELETON("ironsword", EntityType.SKELETON, Material.IRON_SWORD, true), IRON_SWORD_SKELETON("ironsword", EntityType.SKELETON, Material.IRON_SWORD, true),
STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false), STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false),
SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true), SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true),
WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true), WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true), POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false), ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false), CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),
SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true), SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true), ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false), RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true), FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true), LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true), PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false), FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true), SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true), BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true), SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true); NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
public enum Data public enum Data
{ {
BABY, BABY,
@ -148,7 +137,7 @@ public enum MobData
this.value = value; this.value = value;
this.isPublic = isPublic; this.isPublic = isPublic;
} }
private MobData(String n, String h, Object type, Object value, boolean isPublic) private MobData(String n, String h, Object type, Object value, boolean isPublic)
{ {
this.nickname = n; this.nickname = n;
@ -158,13 +147,11 @@ public enum MobData
this.value = value; this.value = value;
this.isPublic = isPublic; this.isPublic = isPublic;
} }
final private String nickname; final private String nickname;
final private String helpMessage; final private String helpMessage;
final private Object type; final private Object type;
final private Object value; final private Object value;
final private boolean isPublic; final private boolean isPublic;
private String matched; private String matched;
public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly) public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly)
@ -184,12 +171,12 @@ public enum MobData
return mobList; return mobList;
} }
public static List<String> getValidHelp(final Entity spawned) public static List<String> getValidHelp(final Entity spawned)
{ {
List<String> output = new ArrayList<String>(); List<String> output = new ArrayList<String>();
LinkedHashMap<String, MobData> posData = getPossibleData(spawned, true); LinkedHashMap<String, MobData> posData = getPossibleData(spawned, true);
for (MobData data : posData.values()) for (MobData data : posData.values())
{ {
output.add(data.helpMessage); output.add(data.helpMessage);
@ -310,7 +297,7 @@ public enum MobData
{ {
throw new Exception(_("slimeMalformedSize"), e); throw new Exception(_("slimeMalformedSize"), e);
} }
} }
else if (this.value instanceof Horse.Color) else if (this.value instanceof Horse.Color)
{ {
((Horse)spawned).setColor((Horse.Color)this.value); ((Horse)spawned).setColor((Horse.Color)this.value);

2
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View file

@ -1,10 +1,10 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.*; import java.util.*;
import lombok.Delegate; import lombok.Delegate;
import net.ess3.api.IEssentials;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.conversations.Conversation; import org.bukkit.conversations.Conversation;

10
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.signs.EssentialsSign; import com.earth2me.essentials.signs.EssentialsSign;
@ -13,6 +12,7 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -411,7 +411,7 @@ public class Settings implements net.ess3.api.ISettings
if (mFormat == null) if (mFormat == null)
{ {
mFormat = config.getString("chat.group-formats." + (group == null ? "Default" : group), mFormat = config.getString("chat.group-formats." + (group == null ? "Default" : group),
config.getString("chat.format", "&7[{GROUP}]&r {DISPLAYNAME}&7:&r {MESSAGE}")); config.getString("chat.format", "&7[{GROUP}]&r {DISPLAYNAME}&7:&r {MESSAGE}"));
mFormat = FormatUtil.replaceFormat(mFormat); mFormat = FormatUtil.replaceFormat(mFormat);
mFormat = mFormat.replace("{DISPLAYNAME}", "%1$s"); mFormat = mFormat.replace("{DISPLAYNAME}", "%1$s");
mFormat = mFormat.replace("{MESSAGE}", "%2$s"); mFormat = mFormat.replace("{MESSAGE}", "%2$s");
@ -651,14 +651,14 @@ public class Settings implements net.ess3.api.ISettings
{ {
return config.getBoolean("trade-in-stacks-" + id, false); return config.getBoolean("trade-in-stacks-" + id, false);
} }
// #easteregg // #easteregg
private boolean economyDisabled = false; private boolean economyDisabled = false;
public boolean _isEcoDisabled() public boolean _isEcoDisabled()
{ {
return config.getBoolean("disable-eco", false); return config.getBoolean("disable-eco", false);
} }
@Override @Override
public boolean isEcoDisabled() public boolean isEcoDisabled()
{ {
@ -1112,7 +1112,7 @@ public class Settings implements net.ess3.api.ISettings
{ {
return config.getInt("max-nick-length", 30); return config.getInt("max-nick-length", 30);
} }
// #easteregg // #easteregg
public int getMaxUserCacheCount() public int getMaxUserCacheCount()
{ {

4
Essentials/src/com/earth2me/essentials/SpawnMob.java
View file

@ -1,15 +1,15 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.Mob.MobException; import com.earth2me.essentials.Mob.MobException;
import com.earth2me.essentials.utils.LocationUtil; import com.earth2me.essentials.utils.LocationUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import net.ess3.api.IEssentials;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;

4
Essentials/src/com/earth2me/essentials/Teleport.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.LocationUtil; import com.earth2me.essentials.utils.LocationUtil;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;

2
Essentials/src/com/earth2me/essentials/TimedTeleport.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import static com.earth2me.essentials.I18n._;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

4
Essentials/src/com/earth2me/essentials/Trade.java
View file

@ -1,7 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround; import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.craftbukkit.SetExpFix; import com.earth2me.essentials.craftbukkit.SetExpFix;
@ -15,6 +13,8 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import net.ess3.api.IUser;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

4
Essentials/src/com/earth2me/essentials/User.java
View file

@ -1,17 +1,17 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.register.payment.Method; import com.earth2me.essentials.register.payment.Method;
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

4
Essentials/src/com/earth2me/essentials/UserData.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.io.File; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import net.ess3.api.IEssentials;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
Essentials/src/com/earth2me/essentials/UserMap.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.utils.StringUtil; import com.earth2me.essentials.utils.StringUtil;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
@ -11,6 +10,7 @@ import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import net.ess3.api.IEssentials;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

6
Essentials/src/com/earth2me/essentials/Warps.java
View file

@ -1,15 +1,15 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.InvalidNameException;
import net.ess3.api.InvalidWorldException;
import com.earth2me.essentials.commands.WarpNotFoundException; import com.earth2me.essentials.commands.WarpNotFoundException;
import com.earth2me.essentials.utils.StringUtil;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.InvalidNameException;
import net.ess3.api.InvalidWorldException;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;

24
Essentials/src/com/earth2me/essentials/api/Economy.java
View file

@ -1,26 +1,26 @@
package com.earth2me.essentials.api; package com.earth2me.essentials.api;
import static net.ess3.api.Economy.add;
import static net.ess3.api.Economy.divide;
import static net.ess3.api.Economy.format;
import static net.ess3.api.Economy.getMoneyExact;
import static net.ess3.api.Economy.hasEnough;
import static net.ess3.api.Economy.hasLess;
import static net.ess3.api.Economy.hasMore;
import static net.ess3.api.Economy.multiply;
import static net.ess3.api.Economy.setMoney;
import static net.ess3.api.Economy.substract;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.EssentialsConf; import com.earth2me.essentials.EssentialsConf;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.StringUtil; import static com.earth2me.essentials.api.Economy.add;
import static com.earth2me.essentials.api.Economy.divide;
import static com.earth2me.essentials.api.Economy.format;
import static com.earth2me.essentials.api.Economy.getMoneyExact;
import static com.earth2me.essentials.api.Economy.hasEnough;
import static com.earth2me.essentials.api.Economy.hasLess;
import static com.earth2me.essentials.api.Economy.hasMore;
import static com.earth2me.essentials.api.Economy.multiply;
import static com.earth2me.essentials.api.Economy.setMoney;
import static com.earth2me.essentials.api.Economy.substract;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.io.File; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.MathContext; import java.math.MathContext;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
/** /**

2
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View file

@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.command.CommandSender;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender;
public class Commandafk extends EssentialsCommand public class Commandafk extends EssentialsCommand

2
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View file

@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.List; import java.util.List;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

2
Essentials/src/com/earth2me/essentials/commands/Commandptime.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import com.earth2me.essentials.utils.DescParseTickFormat;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DescParseTickFormat;
import java.util.*; import java.util.*;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;

6
Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import net.ess3.api.IUser;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IUser;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View file

@ -3,9 +3,9 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.UserMap; import com.earth2me.essentials.UserMap;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.Location; import org.bukkit.Location;

2
Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
View file

@ -3,8 +3,8 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.api.IWarps; import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;

2
Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java
View file

@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.command.CommandSender;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender;
public class Commandsocialspy extends EssentialsToggleCommand public class Commandsocialspy extends EssentialsToggleCommand

2
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
View file

@ -4,9 +4,9 @@ import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Mob; import com.earth2me.essentials.Mob;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.LocationUtil; import com.earth2me.essentials.utils.LocationUtil;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.Locale; import java.util.Locale;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

2
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View file

@ -1,8 +1,6 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.ITarget;
import com.earth2me.essentials.PlayerTarget;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.Server; import org.bukkit.Server;

4
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
View file

@ -1,17 +1,17 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IUser;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.api.IWarps; import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IUser;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

2
Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

2
Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.IEssentialsModule; import com.earth2me.essentials.IEssentialsModule;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

2
Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.metrics; package com.earth2me.essentials.metrics;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

2
Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
View file

@ -1,6 +1,5 @@
package com.earth2me.essentials.metrics; package com.earth2me.essentials.metrics;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.metrics.Metrics.Graph; import com.earth2me.essentials.metrics.Metrics.Graph;
import com.earth2me.essentials.metrics.Metrics.Plotter; import com.earth2me.essentials.metrics.Metrics.Plotter;
import com.earth2me.essentials.register.payment.Method; import com.earth2me.essentials.register.payment.Method;
@ -8,6 +7,7 @@ import com.earth2me.essentials.register.payment.methods.VaultEco;
import com.earth2me.essentials.signs.EssentialsSign; import com.earth2me.essentials.signs.EssentialsSign;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;

4
Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
View file

@ -1,13 +1,13 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;

2
Essentials/src/com/earth2me/essentials/signs/SignBalance.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import net.ess3.api.IEssentials;
public class SignBalance extends EssentialsSign public class SignBalance extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
View file

@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;

2
Essentials/src/com/earth2me/essentials/signs/SignBuy.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignBuy extends EssentialsSign public class SignBuy extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignDisposal.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignDisposal extends EssentialsSign public class SignDisposal extends EssentialsSign

4
Essentials/src/com/earth2me/essentials/signs/SignEnchant.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IEssentials;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
Essentials/src/com/earth2me/essentials/signs/SignFree.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
Essentials/src/com/earth2me/essentials/signs/SignGameMode.java
View file

@ -2,10 +2,10 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IEssentials;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
Essentials/src/com/earth2me/essentials/signs/SignHeal.java
View file

@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignHeal extends EssentialsSign public class SignHeal extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignInfo.java
View file

@ -1,7 +1,6 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.IText;
@ -9,6 +8,7 @@ import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.TextInput; import com.earth2me.essentials.textreader.TextInput;
import com.earth2me.essentials.textreader.TextPager; import com.earth2me.essentials.textreader.TextPager;
import java.io.IOException; import java.io.IOException;
import net.ess3.api.IEssentials;
public class SignInfo extends EssentialsSign public class SignInfo extends EssentialsSign

4
Essentials/src/com/earth2me/essentials/signs/SignKit.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.commands.NoChargeException;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import net.ess3.api.IEssentials;
public class SignKit extends EssentialsSign public class SignKit extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignMail.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.List; import java.util.List;
import net.ess3.api.IEssentials;
public class SignMail extends EssentialsSign public class SignMail extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;

4
Essentials/src/com/earth2me/essentials/signs/SignProtection.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.Trade.OverflowType;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import java.util.*; import java.util.*;
import net.ess3.api.IEssentials;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;

2
Essentials/src/com/earth2me/essentials/signs/SignRepair.java
View file

@ -2,11 +2,11 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.Commandrepair; import com.earth2me.essentials.commands.Commandrepair;
import com.earth2me.essentials.commands.NotEnoughArgumentsException; import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import net.ess3.api.IEssentials;
public class SignRepair extends EssentialsSign public class SignRepair extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignSell.java
View file

@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.Trade.OverflowType;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignSell extends EssentialsSign public class SignSell extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import java.util.List; import java.util.List;
import net.ess3.api.IEssentials;
public class SignSpawnmob extends EssentialsSign public class SignSpawnmob extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/signs/SignTime.java
View file

@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignTime extends EssentialsSign public class SignTime extends EssentialsSign

6
Essentials/src/com/earth2me/essentials/signs/SignTrade.java
View file

@ -1,13 +1,13 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import net.ess3.api.IEssentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade.TradeType;
import com.earth2me.essentials.*; import com.earth2me.essentials.*;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.Trade.OverflowType;
import com.earth2me.essentials.Trade.TradeType;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Map; import java.util.Map;
import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
Essentials/src/com/earth2me/essentials/signs/SignWarp.java
View file

@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

2
Essentials/src/com/earth2me/essentials/signs/SignWeather.java
View file

@ -2,9 +2,9 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
public class SignWeather extends EssentialsSign public class SignWeather extends EssentialsSign

2
Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials.storage; package com.earth2me.essentials.storage;
import net.ess3.api.IEssentials;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
View file

@ -1,10 +1,10 @@
package com.earth2me.essentials.storage; package com.earth2me.essentials.storage;
import net.ess3.api.IEssentials;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

4
Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java
View file

@ -1,11 +1,11 @@
package com.earth2me.essentials.storage; package com.earth2me.essentials.storage;
import com.earth2me.essentials.IConf; import com.earth2me.essentials.IConf;
import net.ess3.api.IEssentials;
import net.ess3.api.IReload;
import java.io.File; import java.io.File;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials;
import net.ess3.api.IReload;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Essentials/src/com/earth2me/essentials/textreader/BookInput.java
View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.textreader; package com.earth2me.essentials.textreader;
import net.ess3.api.IEssentials;
import java.io.*; import java.io.*;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.util.*; import java.util.*;
import net.ess3.api.IEssentials;
public class BookInput implements IText public class BookInput implements IText

2
Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.textreader; package com.earth2me.essentials.textreader;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;

23
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View file

@ -1,8 +1,11 @@
package com.earth2me.essentials.textreader; package com.earth2me.essentials.textreader;
import com.earth2me.essentials.ExecuteTimer; import com.earth2me.essentials.ExecuteTimer;
import net.ess3.api.IEssentials; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.PlayerList;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import static com.earth2me.essentials.textreader.KeywordType.DISPLAYNAME;
import static com.earth2me.essentials.textreader.KeywordType.PLAYER;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.DescParseTickFormat; import com.earth2me.essentials.utils.DescParseTickFormat;
import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.NumberUtil;
@ -10,25 +13,21 @@ import java.lang.management.ManagementFactory;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.ess3.api.IEssentials;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.PlayerList;
import static com.earth2me.essentials.textreader.KeywordType.DISPLAYNAME;
import static com.earth2me.essentials.textreader.KeywordType.PLAYER;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Locale;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class KeywordReplacer implements IText public class KeywordReplacer implements IText
{ {

2
Essentials/src/com/earth2me/essentials/textreader/TextInput.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.textreader; package com.earth2me.essentials.textreader;
import net.ess3.api.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.StringUtil; import com.earth2me.essentials.utils.StringUtil;
import java.io.*; import java.io.*;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.util.*; import java.util.*;
import net.ess3.api.IEssentials;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.utils; package com.earth2me.essentials.utils;
import net.ess3.api.IUser;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.ess3.api.IUser;
public class FormatUtil public class FormatUtil

2
Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
View file

@ -1,12 +1,12 @@
package com.earth2me.essentials.utils; package com.earth2me.essentials.utils;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import net.ess3.api.IEssentials;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IEssentials;
public class NumberUtil public class NumberUtil

2
Essentials/test/com/earth2me/essentials/EconomyTest.java
View file

@ -2,9 +2,9 @@ package com.earth2me.essentials;
import com.earth2me.essentials.api.NoLoanPermittedException; import com.earth2me.essentials.api.NoLoanPermittedException;
import com.earth2me.essentials.api.UserDoesNotExistException; import com.earth2me.essentials.api.UserDoesNotExistException;
import net.ess3.api.Economy;
import java.io.IOException; import java.io.IOException;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.ess3.api.Economy;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.plugin.InvalidDescriptionException; import org.bukkit.plugin.InvalidDescriptionException;
import org.junit.Test; import org.junit.Test;

6
Essentials/test/com/earth2me/essentials/FakeServer.java
View file

@ -1,13 +1,14 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import net.ess3.api.IEssentials;
import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.ServerConfig;
import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.craftbukkit.FakeWorld; import com.earth2me.essentials.craftbukkit.FakeWorld;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.Warning.WarningState; import org.bukkit.Warning.WarningState;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
@ -228,8 +229,7 @@ public class FakeServer implements Server
@Override @Override
public void callEvent(Event event) throws IllegalStateException public void callEvent(Event event) throws IllegalStateException
{ {
Logger.getGlobal().info("Called event " + event.getEventName()); Logger.getLogger("Minecraft").info("Called event " + event.getEventName());
return;
} }
@Override @Override