From 86619275992b4b29bfac91897986b10f2ef863cb Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 31 Dec 2012 02:28:52 +0000 Subject: Merge gravy's pull and reformat code --- .../src/net/ess3/signs/EssentialsSign.java | 37 +++++------ .../src/net/ess3/signs/EssentialsSignsPlugin.java | 8 +-- EssentialsSigns/src/net/ess3/signs/SignConfig.java | 18 +++--- EssentialsSigns/src/net/ess3/signs/Signs.java | 19 +----- .../src/net/ess3/signs/SignsConfigHolder.java | 2 +- .../ess3/signs/listeners/SignBlockListener.java | 71 ++++++++-------------- .../ess3/signs/listeners/SignEntityListener.java | 21 +++---- .../ess3/signs/listeners/SignPlayerListener.java | 9 ++- .../src/net/ess3/signs/signs/SignEnchant.java | 12 ++-- .../src/net/ess3/signs/signs/SignFeed.java | 4 +- .../src/net/ess3/signs/signs/SignFree.java | 4 +- .../src/net/ess3/signs/signs/SignGameMode.java | 4 +- .../src/net/ess3/signs/signs/SignKit.java | 7 ++- .../src/net/ess3/signs/signs/SignMail.java | 2 +- .../src/net/ess3/signs/signs/SignRepair.java | 5 +- .../src/net/ess3/signs/signs/SignSpawnmob.java | 1 - .../src/net/ess3/signs/signs/SignTime.java | 2 +- .../src/net/ess3/signs/signs/SignTrade.java | 18 +++--- .../src/net/ess3/signs/signs/SignWarp.java | 6 +- .../src/net/ess3/signs/signs/SignWeather.java | 2 +- 20 files changed, 98 insertions(+), 154 deletions(-) (limited to 'EssentialsSigns/src/net/ess3/signs') diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 95876ff0f..ad6445c23 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,15 +1,9 @@ package net.ess3.signs; +import static net.ess3.I18n._; import java.util.HashSet; import java.util.Locale; import java.util.Set; -import static net.ess3.I18n._; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.signs.signs.SignException; -import net.ess3.utils.FormatUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -17,6 +11,12 @@ import org.bukkit.block.Sign; import org.bukkit.entity.Player; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.inventory.ItemStack; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.signs.signs.SignException; +import net.ess3.utils.FormatUtil; public class EssentialsSign @@ -86,8 +86,7 @@ public class EssentialsSign } try { - return SignsPermissions.USE.isAuthorized(user, signName) - && onSignInteract(sign, user, getUsername(user), ess); + return SignsPermissions.USE.isAuthorized(user, signName) && onSignInteract(sign, user, getUsername(user), ess); } catch (ChargeException ex) { @@ -107,8 +106,7 @@ public class EssentialsSign final IUser user = ess.getUserMap().getUser(player); try { - return SignsPermissions.BREAK.isAuthorized(user, signName) - && onSignBreak(sign, user, getUsername(user), ess); + return SignsPermissions.BREAK.isAuthorized(user, signName) && onSignBreak(sign, user, getUsername(user), ess); } catch (SignException ex) { @@ -214,12 +212,8 @@ public class EssentialsSign { return true; } - final BlockFace[] directions = new BlockFace[] - { - BlockFace.NORTH, - BlockFace.EAST, - BlockFace.SOUTH, - BlockFace.WEST + final BlockFace[] directions = new BlockFace[]{ + BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST }; for (BlockFace blockFace : directions) { @@ -276,8 +270,7 @@ public class EssentialsSign } } - protected final void validateTrade(final ISign sign, final int amountIndex, final int itemIndex, - final IUser player, final IEssentials ess) throws SignException + protected final void validateTrade(final ISign sign, final int amountIndex, final int itemIndex, final IUser player, final IEssentials ess) throws SignException { if (sign.getLine(itemIndex).equalsIgnoreCase("exp") || sign.getLine(itemIndex).equalsIgnoreCase("xp")) { @@ -292,8 +285,7 @@ public class EssentialsSign sign.setLine(itemIndex, sign.getLine(itemIndex).trim()); } - protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, - final IUser player, final IEssentials ess) throws SignException + protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, final IUser player, final IEssentials ess) throws SignException { if (sign.getLine(itemIndex).equalsIgnoreCase("exp") || sign.getLine(itemIndex).equalsIgnoreCase("xp")) { @@ -301,7 +293,8 @@ public class EssentialsSign return new Trade(amount, ess); } final ItemStack item = getItemStack(sign.getLine(itemIndex), 1, ess); - final int amount = Math.min(getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize()); + final int amount = Math.min( + getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize()); if (item.getTypeId() == 0 || amount < 1) { throw new SignException(_("moreThanZero")); diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index cdd4494ea..2ac464f88 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -1,16 +1,16 @@ package net.ess3.signs; +import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.Bukkit; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.signs.listeners.SignBlockListener; import net.ess3.signs.listeners.SignEntityListener; import net.ess3.signs.listeners.SignPlayerListener; -import org.bukkit.Bukkit; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin diff --git a/EssentialsSigns/src/net/ess3/signs/SignConfig.java b/EssentialsSigns/src/net/ess3/signs/SignConfig.java index 7706907ec..4964333eb 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignConfig.java +++ b/EssentialsSigns/src/net/ess3/signs/SignConfig.java @@ -16,24 +16,24 @@ public class SignConfig implements StorageObject public Map getSigns() { - return signs == null - ? Collections.emptyMap() - : Collections.unmodifiableMap(signs); + return signs == null ? Collections.emptyMap() : Collections.unmodifiableMap(signs); } public void setSigns(final Map signs) { this.signs = signs; } + @Comment( - { - "How many times per second can Essentials signs be interacted with.", - "Values should be between 1-20, 20 being virtually no lag protection.", - "Lower numbers will reduce the possiblity of lag, but may annoy players." - }) + { + "How many times per second can Essentials signs be interacted with.", + "Values should be between 1-20, 20 being virtually no lag protection.", + "Lower numbers will reduce the possiblity of lag, but may annoy players." + }) private int signUsesPerSecond = 4; - public int getSignUsePerSecond() { + public int getSignUsePerSecond() + { return signUsesPerSecond > 0 ? signUsesPerSecond : 1; } diff --git a/EssentialsSigns/src/net/ess3/signs/Signs.java b/EssentialsSigns/src/net/ess3/signs/Signs.java index 6cf7aae54..f9f608cdc 100644 --- a/EssentialsSigns/src/net/ess3/signs/Signs.java +++ b/EssentialsSigns/src/net/ess3/signs/Signs.java @@ -1,23 +1,6 @@ package net.ess3.signs; -import net.ess3.signs.signs.SignBalance; -import net.ess3.signs.signs.SignBuy; -import net.ess3.signs.signs.SignDisposal; -import net.ess3.signs.signs.SignEnchant; -import net.ess3.signs.signs.SignFeed; -import net.ess3.signs.signs.SignFree; -import net.ess3.signs.signs.SignGameMode; -import net.ess3.signs.signs.SignHeal; -import net.ess3.signs.signs.SignInfo; -import net.ess3.signs.signs.SignKit; -import net.ess3.signs.signs.SignMail; -import net.ess3.signs.signs.SignRepair; -import net.ess3.signs.signs.SignSell; -import net.ess3.signs.signs.SignSpawnmob; -import net.ess3.signs.signs.SignTime; -import net.ess3.signs.signs.SignTrade; -import net.ess3.signs.signs.SignWarp; -import net.ess3.signs.signs.SignWeather; +import net.ess3.signs.signs.*; public enum Signs diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java index 9c62337c4..96d1326a4 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java @@ -2,9 +2,9 @@ package net.ess3.signs; import java.io.File; import java.util.*; +import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.storage.AsyncStorageObjectHolder; -import org.bukkit.plugin.Plugin; public class SignsConfigHolder extends AsyncStorageObjectHolder diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java index 9deea4de1..d1ad37da8 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java @@ -2,14 +2,6 @@ package net.ess3.signs.listeners; import java.util.logging.Level; import java.util.logging.Logger; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; -import net.ess3.signs.Signs; -import net.ess3.utils.FormatUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; @@ -18,6 +10,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.*; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; +import net.ess3.signs.Signs; +import net.ess3.utils.FormatUtil; public class SignBlockListener implements Listener @@ -58,8 +58,7 @@ public class SignBlockListener implements Listener for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()) - && !sign.onSignBreak(block, player, ess)) + if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()) && !sign.onSignBreak(block, player, ess)) { return true; } @@ -73,8 +72,7 @@ public class SignBlockListener implements Listener } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBreak(block, player, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, player, ess)) { LOGGER.log(Level.INFO, "A block was protected by a sign."); return true; @@ -105,8 +103,7 @@ public class SignBlockListener implements Listener event.setCancelled(true); return; } - if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName()) - && !sign.onSignCreate(event, ess)) + if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName()) && !sign.onSignCreate(event, ess)) { event.setCancelled(true); return; @@ -123,24 +120,20 @@ public class SignBlockListener implements Listener } final Block against = event.getBlockAgainst(); - if ((against.getTypeId() == WALL_SIGN - || against.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against))) + if ((against.getTypeId() == WALL_SIGN || against.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against))) { event.setCancelled(true); return; } final Block block = event.getBlock(); - if (block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) { return; } for (Signs signs : Signs.values()) { final EssentialsSign sign = signs.getSign(); - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPlace(block, event.getPlayer(), ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPlace(block, event.getPlayer(), ess)) { event.setCancelled(true); return; @@ -157,18 +150,15 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBurn(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBurn(block, ess)) { event.setCancelled(true); return; @@ -185,18 +175,15 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockIgnite(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockIgnite(block, ess)) { event.setCancelled(true); return; @@ -214,18 +201,15 @@ public class SignBlockListener implements Listener for (Block block : event.getBlocks()) { - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPush(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess)) { event.setCancelled(true); return; @@ -245,18 +229,15 @@ public class SignBlockListener implements Listener if (event.isSticky()) { final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPush(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java index 2be907813..8fdebce8e 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java @@ -1,8 +1,5 @@ package net.ess3.signs.listeners; -import net.ess3.api.IEssentials; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -10,6 +7,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; +import net.ess3.api.IEssentials; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; public class SignEntityListener implements Listener @@ -33,10 +33,8 @@ public class SignEntityListener implements Listener for (Block block : event.blockList()) { - if (((block.getTypeId() == Material.WALL_SIGN.getId() - || block.getTypeId() == Material.SIGN_POST.getId()) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; @@ -61,18 +59,15 @@ public class SignEntityListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == Material.WALL_SIGN.getId() - || block.getTypeId() == Material.SIGN_POST.getId()) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBreak(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java index 8c6fc6899..f1460f411 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java @@ -1,8 +1,5 @@ package net.ess3.signs.listeners; -import net.ess3.api.IEssentials; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; @@ -11,6 +8,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +import net.ess3.api.IEssentials; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; public class SignPlayerListener implements Listener @@ -55,8 +55,7 @@ public class SignPlayerListener implements Listener { for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockInteract(block, event.getPlayer(), ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockInteract(block, event.getPlayer(), ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java index 365de9557..90acd26f4 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java @@ -1,15 +1,15 @@ package net.ess3.signs.signs; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.bukkit.Enchantments; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; public class SignEnchant extends EssentialsSign @@ -90,10 +90,8 @@ public class SignEnchant extends EssentialsSign } final ItemStack playerHand = player.getPlayer().getItemInHand(); - if (playerHand == null - || playerHand.getAmount() != 1 - || (playerHand.containsEnchantment(enchantment) - && playerHand.getEnchantmentLevel(enchantment) == level)) + if (playerHand == null || playerHand.getAmount() != 1 || (playerHand.containsEnchantment(enchantment) && playerHand.getEnchantmentLevel( + enchantment) == level)) { throw new SignException(_("missingItems", 1, sign.getLine(1))); } diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java index ab5151caf..a1c6abc29 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java @@ -14,14 +14,14 @@ public class SignFeed extends EssentialsSign { super("Feed"); } - + @Override protected boolean onSignCreate(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { validateTrade(sign, 1, ess); return true; } - + @Override protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException, ChargeException { diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java index cf7ffed50..fb9a27254 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java @@ -1,13 +1,13 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class SignFree extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java index 52972e9cd..159e85d4a 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java @@ -1,13 +1,13 @@ package net.ess3.signs.signs; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.GameMode; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.GameMode; public class SignGameMode extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java index ed8fb075b..847816db8 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java @@ -53,13 +53,14 @@ public class SignKit extends EssentialsSign { final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) - || (group.isEmpty() && Permissions.KITS.isAuthorized(player, kitName))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.KITS.isAuthorized( + player, kitName))) { final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); try - {; + { + ; final Kit kit = ess.getKits().getKit(kitName); ess.getKits().checkTime(player, kit); ess.getKits().sendKit(player, kit); diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java index 2f93aadb0..aca55a6ea 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java @@ -1,7 +1,7 @@ package net.ess3.signs.signs; -import java.util.List; import static net.ess3.I18n._; +import java.util.List; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.signs.EssentialsSign; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java index 5b60c348c..cd3d9dc93 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java @@ -40,9 +40,8 @@ public class SignRepair extends EssentialsSign Commandrepair command = new Commandrepair(); command.init(ess, "repair"); - String[] args = new String[] - { - sign.getLine(1) + String[] args = new String[]{ + sign.getLine(1) }; try { diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java b/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java index 39b1b0db5..bf52f5d50 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java @@ -4,7 +4,6 @@ import net.ess3.SpawnMob; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; -import net.ess3.commands.Commandspawnmob; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java index d6d65f76d..77e992f60 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.World; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.World; public class SignTime extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java index 798fb1733..79479e96c 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java @@ -1,6 +1,7 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; @@ -8,7 +9,7 @@ import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; import net.ess3.signs.SignsPermissions; import net.ess3.utils.FormatUtil; -import org.bukkit.inventory.ItemStack; + //TODO: Sell Enchantment on Trade signs? public class SignTrade extends EssentialsSign @@ -77,10 +78,8 @@ public class SignTrade extends EssentialsSign { final Trade trade = getTrade(sign, 2, false, false, ess); ItemStack itemInHand = player.getPlayer().getItemInHand(); - if (trade.getItemStack() != null && itemInHand != null - && trade.getItemStack().getTypeId() == itemInHand.getTypeId() - && trade.getItemStack().getDurability() == itemInHand.getDurability() - && trade.getItemStack().getEnchantments().equals(itemInHand.getEnchantments())) + if (trade.getItemStack() != null && itemInHand != null && trade.getItemStack().getTypeId() == itemInHand.getTypeId() && trade.getItemStack().getDurability() == itemInHand.getDurability() && trade.getItemStack().getEnchantments().equals( + itemInHand.getEnchantments())) { int amount = itemInHand.getAmount(); amount -= amount % trade.getItemStack().getAmount(); @@ -100,8 +99,7 @@ public class SignTrade extends EssentialsSign @Override protected boolean onSignBreak(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { - if ((sign.getLine(3).length() > 3 && sign.getLine(3).substring(2).equalsIgnoreCase(username)) - || SignsPermissions.TRADE_OVERRIDE.isAuthorized(player)) + if ((sign.getLine(3).length() > 3 && sign.getLine(3).substring(2).equalsIgnoreCase(username)) || SignsPermissions.TRADE_OVERRIDE.isAuthorized(player)) { try { @@ -174,8 +172,7 @@ public class SignTrade extends EssentialsSign { throw new SignException(_("moreThanZero")); } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) - && getItemStack(split[1], amount, ess).getTypeId() == 0) + if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], amount, ess).getTypeId() == 0) { throw new SignException(_("moreThanZero")); } @@ -197,8 +194,7 @@ public class SignTrade extends EssentialsSign { throw new SignException(_("moreThanZero")); } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) - && getItemStack(split[1], stackamount, ess).getTypeId() == 0) + if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], stackamount, ess).getTypeId() == 0) { throw new SignException(_("moreThanZero")); } diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java index 08c9795ef..8cad890e9 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.signs.EssentialsSign; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class SignWarp extends EssentialsSign @@ -52,8 +52,8 @@ public class SignWarp extends EssentialsSign final String warpName = sign.getLine(1); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) - || (group.isEmpty() && Permissions.WARPS.isAuthorized(player, warpName))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.WARPS.isAuthorized( + player, warpName))) { final Trade charge = getTrade(sign, 3, ess); try diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java index 0d428f11d..d96c40355 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.World; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.World; public class SignWeather extends EssentialsSign -- cgit v1.2.3