diff options
27 files changed, 245 insertions, 256 deletions
diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 89c34f96d..a12828db6 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -89,7 +89,7 @@ <artifactSet> <includes> <include>commons-io:*</include> - <include>org.apache.commons:*</include> + <include>org.apache.commons:commons-compress</include> </includes> </artifactSet> <minimizeJar>true</minimizeJar> diff --git a/Essentials/src/net/ess3/I18n.java b/Essentials/src/net/ess3/I18n.java index 9cc7b10dd..6ea824e89 100644 --- a/Essentials/src/net/ess3/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -126,7 +126,7 @@ public class I18n implements II18n currentLocale = new Locale(parts[0], parts[1], parts[2]); } ResourceBundle.clearCache(); - Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString())); + ess.getLogger().log(Level.INFO, String.format("Using locale %s", currentLocale.toString())); customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess)); localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale); } diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index d3f1679cf..50c99cb51 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -30,7 +30,6 @@ import org.bukkit.plugin.PluginManager; public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails { - private static final Logger LOGGER = Bukkit.getLogger(); public Jails(final IEssentials ess) { @@ -174,11 +173,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } } @@ -200,11 +199,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } user.sendMessage(_("§4You do the crime, you do the time.")); @@ -227,11 +226,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); + ess.getLogger().log(Level.INFO, _("§4Error occurred when trying to return player§c {0} §4to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } user.sendMessage(_("§4You do the crime, you do the time.")); diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index f56ef2168..5e0b461d5 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -17,7 +17,6 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor private final ClassLoader classLoader; private final String commandPath; private final String permissionPrefix;// TODO: Needed? - private static final Logger LOGGER = Bukkit.getLogger(); private final Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>(); private final Map<String, String> disabledList = new HashMap<String, String>(); private final Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>(); @@ -106,7 +105,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor catch (Exception ex) { sender.sendMessage(_("§4Command {0} is improperly loaded.", commandName)); - LOGGER.log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex); + ess.getLogger().log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex); return true; } } @@ -114,7 +113,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor // Check authorization if (sender != null && !cmd.isAuthorized(sender)) { - LOGGER.log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName())); + ess.getLogger().log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName())); sender.sendMessage(_("§4You do not have access to that command.")); return true; } @@ -163,7 +162,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor } catch (Exception ex) { - LOGGER.log(Level.SEVERE, _("Command {0} failed:", commandLabel), ex); + ess.getLogger().log(Level.SEVERE, _("Command {0} failed:", commandLabel), ex); return true; } } @@ -237,7 +236,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor catch (Exception ex) { sender.sendMessage(_("§4Command {0} is improperly loaded.", commandName)); - LOGGER.log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex); + ess.getLogger().log(Level.SEVERE, _("§4Command {0} is improperly loaded.", commandName), ex); return null; } } @@ -245,7 +244,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor // Check authorization if (sender != null && !cmd.isAuthorized(sender)) { - LOGGER.log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName())); + ess.getLogger().log(Level.WARNING, _("§c{0} §4was denied access to command.", sender.getName())); sender.sendMessage(_("§4You do not have access to that command.")); return null; } @@ -279,7 +278,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor } catch (Exception ex) { - LOGGER.log(Level.SEVERE, _("Command {0} failed:", commandLabel), ex); + ess.getLogger().log(Level.SEVERE, _("Command {0} failed:", commandLabel), ex); return null; } } @@ -290,7 +289,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor sender.sendMessage(_("§cError:§4 {0}", exception.getMessage())); if (ess.getSettings().isDebug()) { - LOGGER.log(Level.WARNING, _("Error calling command /{0}", commandLabel), exception); + ess.getLogger().log(Level.WARNING, _("Error calling command /{0}", commandLabel), exception); } } @@ -400,7 +399,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor final String altString = pc.getPlugin().getName() + ":" + pc.getLabel(); if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString); //TODO: TL key? + ess.getLogger().log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString); //TODO: TL key? } disabledList.put(label, altString); } diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 8b74e1af7..d2d3a5357 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -39,7 +39,6 @@ import org.bukkit.inventory.ItemStack; public class EssentialsPlayerListener implements Listener { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private final Server server; private final IEssentials ess; private final IUserMap userMap; @@ -73,7 +72,7 @@ public class EssentialsPlayerListener implements Listener { event.setCancelled(true); user.sendMessage(_("§6You have been muted!")); - LOGGER.info(_("{0} tried to speak, but is muted.", user.getName())); + ess.getLogger().info(_("{0} tried to speak, but is muted.", user.getName())); } final Iterator<Player> it = event.getRecipients().iterator(); while (it.hasNext()) @@ -306,11 +305,11 @@ public class EssentialsPlayerListener implements Listener { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.WARNING, ex.getMessage(), ex); + ess.getLogger().log(Level.WARNING, ex.getMessage(), ex); } else { - LOGGER.log(Level.WARNING, ex.getMessage()); + ess.getLogger().log(Level.WARNING, ex.getMessage()); } } } diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index 6f88f9c8c..e3bebfeac 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -56,7 +56,7 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, "File can't be closed: " + file.toString(), ex); + ess.getLogger().log(Level.SEVERE, "File can't be closed: " + file.toString(), ex); } } @@ -64,14 +64,14 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp catch (FileNotFoundException ex) { onException(ex); - Bukkit.getLogger().log(Level.INFO, "File not found: " + file.toString()); + ess.getLogger().log(Level.INFO, "File not found: " + file.toString()); } catch (ObjectLoadException ex) { onException(ex); File broken = new File(file.getAbsolutePath() + ".broken." + System.currentTimeMillis()); file.renameTo(broken); - Bukkit.getLogger().log(Level.SEVERE, "The file " + file.toString() + " is broken, it has been renamed to " + broken.toString(), ex.getCause()); + ess.getLogger().log(Level.SEVERE, "The file " + file.toString() + " is broken, it has been renamed to " + broken.toString(), ex.getCause()); } } } diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 0ce4750a7..19962373e 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -48,7 +48,7 @@ public abstract class AbstractDelayedYamlFileWriter implements Runnable } catch (FileNotFoundException ex) { - Bukkit.getLogger().log(Level.SEVERE, file.toString(), ex); + ess.getLogger().log(Level.SEVERE, file.toString(), ex); } finally { diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index b4a82b2bc..097b06308 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -32,7 +32,7 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen } catch (Exception ex) { - Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex); + ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } } @@ -175,7 +175,7 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen } catch (Exception ex) { - Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex); + ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } } loaded.set(true); diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index 9e13bbc3b..ef718fcf4 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -19,9 +19,11 @@ public class ManagedFile { private final static int BUFFERSIZE = 1024 * 8; private final File file; + protected final IEssentials ess; public ManagedFile(final String filename, final IEssentials ess) { + this.ess = ess; file = new File(ess.getPlugin().getDataFolder(), filename); if (file.exists()) @@ -35,7 +37,7 @@ public class ManagedFile } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex); + ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } } @@ -47,7 +49,7 @@ public class ManagedFile } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, _("Could not load items.csv!"), ex); + ess.getLogger().log(Level.SEVERE, _("Could not load items.csv!"), ex); } } } @@ -222,7 +224,7 @@ public class ManagedFile } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex); + ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex); return Collections.emptyList(); } } diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index 334b1d0cd..eab35a677 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -15,16 +15,17 @@ import org.bukkit.plugin.PluginDescriptionFile; public class HelpInput implements IText { + protected final IEssentials ess; private static final String DESCRIPTION = "description"; private static final String PERMISSION = "permission"; private static final String PERMISSIONS = "permissions"; private final List<String> lines = new ArrayList<String>(); private final List<String> chapters = new ArrayList<String>(); private final Map<String, Integer> bookmarks = new HashMap<String, Integer>(); - private final static Logger logger = Logger.getLogger("Minecraft"); public HelpInput(final IUser user, final String match, final IEssentials ess) throws IOException { + this.ess = ess; final ISettings settings = ess.getSettings(); boolean reported = false; final List<String> newLines = new ArrayList<String>(); @@ -147,7 +148,7 @@ public class HelpInput implements IText { if (!reported) { - logger.log(Level.WARNING, _("Error getting help for plugin: {0}", pluginNameLow), ex); + ess.getLogger().log(Level.WARNING, _("Error getting help for plugin: {0}", pluginNameLow), ex); } reported = true; continue; diff --git a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java index c22730f3d..ee9ce0f6b 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java @@ -15,12 +15,12 @@ public class Essentials extends JavaPlugin @Override public void onEnable() { - Bukkit.getLogger().info("You can remove this compatibility plugin, when all plugins are updated to Essentials-3"); + IPlugin plugin = (IPlugin)getServer().getPluginManager().getPlugin("Essentials-3"); + ess = plugin.getEssentials(); + ess.getLogger().info("You can remove this compatibility plugin, when all plugins are updated to Essentials-3"); //TODO: Update files to new 3.0 format //TODO: Move Eco Api here //TODO: write update methods for itemmeta - IPlugin plugin = (IPlugin)getServer().getPluginManager().getPlugin("Essentials-3"); - ess = plugin.getEssentials(); updateSettings(); updateUserfiles(); } diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java index 40ed1918c..95006b831 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java @@ -17,7 +17,6 @@ import org.bukkit.inventory.ItemStack; public final class Settings implements ISettings { private final EssentialsConf config; - private final static Logger logger = Logger.getLogger("Minecraft"); private final IEssentials ess; private boolean metricsEnabled = true; @@ -418,7 +417,7 @@ public final class Settings implements ISettings final List<Integer> epItemSpwn = new ArrayList<Integer>(); if (ess.getItemDb() == null) { - logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded."); + ess.getLogger().log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded."); return epItemSpwn; } for (String itemName : config.getString("item-spawn-blacklist", "").split(",")) @@ -435,7 +434,7 @@ public final class Settings implements ISettings } catch (Exception ex) { - logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist")); + ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist")); } } return epItemSpwn; @@ -471,7 +470,7 @@ public final class Settings implements ISettings } catch (Exception ex) { - logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns")); + ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns")); continue; } signsEnabled = true; @@ -565,7 +564,7 @@ public final class Settings implements ISettings } catch (Exception ex) { - logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName)); + ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName)); } } return list; diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java index b76152916..8a1206b29 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java @@ -12,7 +12,6 @@ import org.bukkit.plugin.Plugin; public class EssentialsConnect { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private final IEssentials ess; private final IAntiBuild antib; @@ -20,7 +19,7 @@ public class EssentialsConnect { if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); + essPlugin.getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); } ess = ((BukkitPlugin)essPlugin).getEssentials(); antib = (IAntiBuild)essProtect; @@ -43,7 +42,7 @@ public class EssentialsConnect final Location loc = user.getLocation(); final String warnMessage = _( "alertFormat", user.getName(), type, item, loc.getWorld().getName() + "," + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ()); - LOGGER.log(Level.WARNING, warnMessage); + ess.getLogger().log(Level.WARNING, warnMessage); for (Player p : ess.getServer().getOnlinePlayers()) { if (Permissions.ALERTS.isAuthorized(p)) diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java index c80694d22..cbe0416c9 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java @@ -18,7 +18,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsChat extends JavaPlugin { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); @Override public void onEnable() @@ -28,7 +27,7 @@ public class EssentialsChat extends JavaPlugin final IEssentials ess = (IEssentials)plugin.getEssentials(); if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); + getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); } if (!plugin.isEnabled()) { diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index 15e2d3b8b..fb498f5e9 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -18,7 +18,6 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; public abstract class EssentialsChatPlayer implements Listener { protected IEssentials ess; - protected final static Logger LOGGER = Logger.getLogger("Minecraft"); protected final Server server; protected final Map<AsyncPlayerChatEvent, ChatStore> chatStorage; diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index 4936ad0ab..bfdb41292 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -27,7 +27,6 @@ import org.bukkit.plugin.Plugin; public class EssentialsGeoIPPlayerListener implements Listener, IReload { private LookupService ls = null; - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private File databaseFile; private final ConfigHolder config; private final IEssentials ess; @@ -127,7 +126,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } else { - LOGGER.log(Level.SEVERE, _("Can't find GeoIP database!")); + ess.getLogger().log(Level.SEVERE, _("Can't find GeoIP database!")); return; } } @@ -137,7 +136,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to read GeoIP database!"), ex); + ess.getLogger().log(Level.SEVERE, _("Failed to read GeoIP database!"), ex); } } @@ -145,7 +144,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload { if (url == null || url.isEmpty()) { - LOGGER.log(Level.SEVERE, _("GeoIP download url is empty.")); + ess.getLogger().log(Level.SEVERE, _("GeoIP download url is empty.")); return; } if (!databaseFile.getAbsoluteFile().getParentFile().exists()) @@ -156,7 +155,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload OutputStream output = null; try { - LOGGER.log(Level.INFO, _("Downloading GeoIP database... this might take a while (country: 0.6 MB, city: 20MB)")); + ess.getLogger().log(Level.INFO, _("Downloading GeoIP database... this might take a while (country: 0.6 MB, city: 20MB)")); final URL downloadUrl = new URL(url); final URLConnection conn = downloadUrl.openConnection(); conn.setConnectTimeout(10000); @@ -179,11 +178,11 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (MalformedURLException ex) { - LOGGER.log(Level.SEVERE, _("GeoIP download url is invalid."), ex); + ess.getLogger().log(Level.SEVERE, _("GeoIP download url is invalid."), ex); } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); + ess.getLogger().log(Level.SEVERE, _("Failed to open connection."), ex); } finally { @@ -195,7 +194,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); + ess.getLogger().log(Level.SEVERE, _("Failed to open connection."), ex); } } if (input != null) @@ -206,7 +205,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to open connection."), ex); + ess.getLogger().log(Level.SEVERE, _("Failed to open connection."), ex); } } } diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java index 8002a469e..6d1a1c333 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java @@ -10,7 +10,6 @@ import org.bukkit.plugin.Plugin; public class EssentialsConnect { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private final IEssentials ess; private final IProtect protect; @@ -18,7 +17,7 @@ public class EssentialsConnect { if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); + essPlugin.getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); } ess = ((BukkitPlugin)essPlugin).getEssentials(); protect = (IProtect)essProtect; diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java index 2bb765b50..8b9fc7656 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java @@ -10,7 +10,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsProtect extends JavaPlugin implements IProtect { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private EssentialsConnect ess = null; private ProtectHolder settings = null; @@ -45,7 +44,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { player.sendMessage("Essentials Protect is in emergency mode. Check your log for errors."); //TODO: tl this } - LOGGER.log(Level.SEVERE, "Essentials not installed or failed to load. Essentials Protect is in emergency mode now."); //TODO: tl this + getLogger().log(Level.SEVERE, "Essentials not installed or failed to load. Essentials Protect is in emergency mode now."); //TODO: tl this } @Override diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index 1143aa022..7d5e80cf9 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -15,7 +15,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin { - private static final Logger LOGGER = Bukkit.getLogger(); private SignsConfigHolder config; @Override @@ -26,7 +25,7 @@ public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin final IEssentials ess = (IEssentials)plugin.getEssentials(); if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); + getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); } if (!plugin.isEnabled()) { diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java index 69ca1b4c2..9c0b853cc 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java @@ -23,7 +23,6 @@ public class SignBlockListener implements Listener { private final IEssentials ess; private final ISignsPlugin plugin; - private final static Logger LOGGER = Logger.getLogger("Minecraft"); private final static int WALL_SIGN = Material.WALL_SIGN.getId(); private final static int SIGN_POST = Material.SIGN_POST.getId(); @@ -52,7 +51,7 @@ public class SignBlockListener implements Listener // prevent any signs be broken by destroying the block they are attached to if (EssentialsSign.checkIfBlockBreaksSigns(block)) { - LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign."); + ess.getLogger().log(Level.INFO, "Prevented that a block was broken next to a sign."); return true; } @@ -73,7 +72,7 @@ public class SignBlockListener implements Listener { if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, player, ess)) { - LOGGER.log(Level.INFO, "A block was protected by a sign."); + ess.getLogger().log(Level.INFO, "A block was protected by a sign."); return true; } } diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java index 13aec2c00..be9cb16c2 100644 --- a/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java @@ -17,7 +17,7 @@ public class EssentialsUpdate extends JavaPlugin { if (!getDataFolder().exists() && !getDataFolder().mkdirs()) { - Bukkit.getLogger().log(Level.SEVERE, "Could not create data folder: {0}", getDataFolder().getPath()); + getLogger().log(Level.SEVERE, "Could not create data folder: {0}", getDataFolder().getPath()); } essentialsHelp = new EssentialsHelp(this); essentialsHelp.registerEvents(); @@ -33,7 +33,7 @@ public class EssentialsUpdate extends JavaPlugin } else { - Bukkit.getLogger().info("Essentials is ready for installation. Join the game and follow the instructions."); + getLogger().info("Essentials is ready for installation. Join the game and follow the instructions."); } } diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index bd3e6300e..0a3f3edab 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -42,7 +42,7 @@ public class UpdateCheck { if (new File(plugin.getDataFolder().getParentFile(), "Essentials.jar").exists()) { - Bukkit.getLogger().severe("Essentials.jar found, but not recognized by Bukkit. Broken download?"); + plugin.getLogger().severe("Essentials.jar found, but not recognized by Bukkit. Broken download?"); } } } diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java index 117daab8c..ec9017461 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java @@ -19,7 +19,6 @@ import org.bukkit.plugin.Plugin; public class UpdateFile { - private final static Logger LOGGER = Bukkit.getLogger(); private final static String UPDATE_URL = "http://goo.gl/67jev"; private final static BigInteger PUBLIC_KEY = new BigInteger( "5ha6a2d4qdy17ttkg8evh74sl5a87djojwenu12k1lvy8ui6003e6l06rntczpoh99mhc3txj8mqlxw111oyy9yl7s7qpyluyzix3j1odxrxx4u52gxvyu6qiteapczkzvi7rxgeqsozz7b19rdx73a7quo9ybwpz1cr82r7x5k0pg2a73pjjsv2j1awr13azo7klrcxp9y5xxwf5qv1s3tw4zqftli18u0ek5qkbzfbgk1v5n2f11pkwwk6p0mibrn26wnjbv11vyiqgu95o7busmt6vf5q7grpcenl637w83mbin56s3asj1131b2mscj9xep3cbj7la9tgsxl5bj87vzy8sk2d34kzwqdqgh9nry43nqqus12l1stmiv184r8r3jcy8w43e8h1u1mzklldb5eytkuhayqik8l3ns04hwt8sgacvw534be8sx26qrn5s1", @@ -37,12 +36,12 @@ public class UpdateFile { if (file.exists() && !file.delete()) { - LOGGER.log(Level.SEVERE, "Could not delete file update.yml!"); + plugin.getLogger().log(Level.SEVERE, "Could not delete file update.yml!"); return; } if (!downloadFile() || !checkFile()) { - LOGGER.log(Level.SEVERE, "Could not download and verify file update.yml!"); + plugin.getLogger().log(Level.SEVERE, "Could not download and verify file update.yml!"); return; } } @@ -52,7 +51,7 @@ public class UpdateFile } catch (Exception ex) { - LOGGER.log(Level.SEVERE, "Could not load update.yml!"); + plugin.getLogger().log(Level.SEVERE, "Could not load update.yml!"); } } @@ -69,7 +68,7 @@ public class UpdateFile } catch (IOException ex) { - LOGGER.log(Level.SEVERE, "Error while downloading update.yml", ex); + plugin.getLogger().log(Level.SEVERE, "Error while downloading update.yml", ex); return false; } } @@ -163,7 +162,7 @@ public class UpdateFile } catch (Exception ex) { - LOGGER.log(Level.SEVERE, ex.getMessage(), ex); + plugin.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } finally { @@ -176,7 +175,7 @@ public class UpdateFile } catch (IOException ex) { - LOGGER.log(Level.SEVERE, ex.getMessage(), ex); + plugin.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } } return false; diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java index 9d09264e3..b13c9f382 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java @@ -43,7 +43,7 @@ public class UpdateProcess implements Listener { currentPlayer.sendMessage("A newer version of EssentialsUpdate is found. Downloading new file and reloading server."); } - Bukkit.getLogger().log(Level.INFO, "A newer version of EssentialsUpdate is found. Downloading new file and reloading server."); + plugin.getLogger().log(Level.INFO, "A newer version of EssentialsUpdate is found. Downloading new file and reloading server."); new SelfUpdate( new AbstractWorkListener(plugin, updateCheck.getNewVersionInfo()) { @@ -70,7 +70,7 @@ public class UpdateProcess implements Listener } if (message != null && !message.isEmpty()) { - Bukkit.getLogger().log(Level.INFO, message); + plugin.getLogger().log(Level.INFO, message); } UpdateProcess.this.currentPlayer = null; } diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index e89d142da..75ee46542 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -18,7 +18,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static EssentialsXMPP instance = null; private UserManager users; private XMPPManager xmpp; @@ -40,7 +39,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP ess = plugin.getEssentials(); if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); + getLogger().log(Level.WARNING, _("§4Version mismatch! Please update all Essentials jars to the same version.")); } if (!plugin.isEnabled()) { diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index 34d98cb11..8097a992f 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -3,6 +3,7 @@ package net.ess3.xmpp; import java.io.File; import java.util.*; import java.util.logging.*; +import net.ess3.api.IEssentials; import net.ess3.api.IReload; import net.ess3.api.IUser; import net.ess3.utils.FormatUtil; @@ -17,7 +18,6 @@ import org.jivesoftware.smack.util.StringUtils; public final class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IReload { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static final SimpleFormatter formatter = new SimpleFormatter(); private YamlConfiguration config = null; private XMPPConnection connection; @@ -98,7 +98,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM final String server = config.getString("xmpp.server"); if (server == null || server.equals("example.com")) { - LOGGER.log(Level.WARNING, "config broken for xmpp"); + parent.getLogger().log(Level.WARNING, "config broken for xmpp"); return false; } final int port = config.getInt("xmpp.port", 5222); @@ -109,7 +109,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM final StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("Connecting to xmpp server ").append(server).append(":").append(port); stringBuilder.append(" as user ").append(xmppuser).append("."); - LOGGER.log(Level.INFO, stringBuilder.toString()); + parent.getLogger().log(Level.INFO, stringBuilder.toString()); connConf.setSASLAuthenticationEnabled(config.getBoolean("xmpp.sasl-enabled", false)); connConf.setSendPresence(true); connConf.setReconnectionAllowed(true); @@ -125,7 +125,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM } catch (XMPPException ex) { - LOGGER.log(Level.WARNING, "Failed to connect to server: " + server, ex); + parent.getLogger().log(Level.WARNING, "Failed to connect to server: " + server, ex); return false; } } @@ -165,7 +165,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM @Override public void onReload() { - LOGGER.removeHandler(this); + parent.getLogger().removeHandler(this); config = YamlConfiguration.loadConfiguration(new File(parent.getDataFolder(), "config.yml")); synchronized (chats) { @@ -179,7 +179,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM } if (config.getBoolean("log-enabled", false)) { - LOGGER.addHandler(this); + parent.getLogger().addHandler(this); logUsers = config.getStringList("log-users"); final String level = config.getString("log-level", "info"); try @@ -271,14 +271,14 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM catch (XMPPException ex) { failedUsers.add(user); - LOGGER.removeHandler(XMPPManager.this); - LOGGER.log(Level.SEVERE, "Failed to deliver log message! Disabling logging to XMPP.", ex); + parent.getLogger().removeHandler(XMPPManager.this); + parent.getLogger().log(Level.SEVERE, "Failed to deliver log message! Disabling logging to XMPP.", ex); } } logUsers.removeAll(failedUsers); if (logUsers.isEmpty()) { - LOGGER.removeHandler(XMPPManager.this); + parent.getLogger().removeHandler(XMPPManager.this); threadrunning = false; } copy.clear(); @@ -292,7 +292,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM threadrunning = false; } } - LOGGER.removeHandler(XMPPManager.this); + parent.getLogger().removeHandler(XMPPManager.this); } }); loggerThread.start(); @@ -333,7 +333,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM } catch (XMPPException ex) { - LOGGER.log(Level.WARNING, "Failed to send xmpp message.", ex); + parent.getLogger().log(Level.WARNING, "Failed to send xmpp message.", ex); } } else @@ -357,7 +357,7 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM } catch (Exception ex) { - LOGGER.log(Level.SEVERE, ex.getMessage(), ex); + parent.getLogger().log(Level.SEVERE, ex.getMessage(), ex); } } } @@ -1,174 +1,174 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>BuildAll</name> - <url>http://tiny.cc/EssentialsWiki</url> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>BuildAll</name> + <url>http://tiny.cc/EssentialsWiki</url> - <modules> - <module>Essentials</module> - <module>Essentials2Compat</module> - <module>EssentialsChat</module> - <module>EssentialsExtra</module> - <module>EssentialsGeoIP</module> - <module>EssentialsGroupManager</module> - <module>EssentialsProtect</module> - <module>EssentialsSigns</module> - <module>EssentialsUpdate</module> - <module>EssentialsXMPP</module> - <module>EssentialsAntiBuild</module> - </modules> + <modules> + <module>Essentials</module> + <module>Essentials2Compat</module> + <module>EssentialsChat</module> + <module>EssentialsExtra</module> + <module>EssentialsGeoIP</module> + <module>EssentialsGroupManager</module> + <module>EssentialsProtect</module> + <module>EssentialsSigns</module> + <module>EssentialsUpdate</module> + <module>EssentialsXMPP</module> + <module>EssentialsAntiBuild</module> + </modules> - <repositories> - <repository> - <id>essentials-repo</id> - <url>http://ci.ess3.net/nexus/content/groups/public/</url> - </repository> - </repositories> + <repositories> + <repository> + <id>essentials-repo</id> + <url>http://ci.ess3.net/nexus/content/groups/public/</url> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>org.bukkit</groupId> - <artifactId>bukkit</artifactId> - <version>${bukkit.version}</version> - </dependency> - </dependencies> - - <pluginRepositories> - <pluginRepository> - <id>gettext-commons-site</id> - <url>http://gettext-commons-maven-repository.googlecode.com/svn/repository/</url> - <releases> - <updatePolicy>daily</updatePolicy> - </releases> - </pluginRepository> - </pluginRepositories> + <dependencies> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>bukkit</artifactId> + <version>${bukkit.version}</version> + </dependency> + </dependencies> - <build> - <finalName>${project.name}</finalName> - <sourceDirectory>${project.basedir}/src</sourceDirectory> - <testSourceDirectory>${project.basedir}/test</testSourceDirectory> - <resources> - <resource> - <directory>${project.basedir}/src</directory> - <filtering>true</filtering> - <includes> - <include>*.*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <outputDirectory>../jars</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.xnap.commons</groupId> - <artifactId>maven-gettext-plugin</artifactId> - <version>1.2.3</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>merge</goal> - <goal>dist</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> + <pluginRepositories> + <pluginRepository> + <id>gettext-commons-site</id> + <url>http://gettext-commons-maven-repository.googlecode.com/svn/repository/</url> + <releases> + <updatePolicy>daily</updatePolicy> + </releases> + </pluginRepository> + </pluginRepositories> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkit.version>1.5.1-R0.2</bukkit.version> - <build.number>Unknown</build.number> - <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> - <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> - <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab> - <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>2</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size> - <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>120</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width> - <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap> - <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader>0 - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass>2 - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>false - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder>* - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>4 - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch>false - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine>true - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups>false - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast>false - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>4 - </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size> - </properties> + <build> + <finalName>${project.name}</finalName> + <sourceDirectory>${project.basedir}/src</sourceDirectory> + <testSourceDirectory>${project.basedir}/test</testSourceDirectory> + <resources> + <resource> + <directory>${project.basedir}/src</directory> + <filtering>true</filtering> + <includes> + <include>*.*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <outputDirectory>../jars</outputDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.0</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.xnap.commons</groupId> + <artifactId>maven-gettext-plugin</artifactId> + <version>1.2.3</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>merge</goal> + <goal>dist</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <bukkit.version>1.5.1-R0.1-SNAPSHOT</bukkit.version> + <build.number>Unknown</build.number> + <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> + <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> + <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab> + <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>2</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size> + <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>120</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width> + <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap> + <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader>0 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass>2 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder>* + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>4 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>4 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size> + </properties> </project> |