From a0df79cc0615c847c6b09b83087666a5704593bf Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 11:56:48 -0500 Subject: [PATCH 01/14] Removed unused imports in Essentials. Signed-off-by: Paul Buonopane --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2a363404d..41c89d007 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /Essentials2Compat/build/ /EssentialsGroupManager/bin /EssentialsGroupManager/.externalToolBuilders +/EssentialsGeoIP/build \ No newline at end of file From 5da1e9a220e2100f1dd3a2079fe2343d113d5ee3 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 11:58:43 -0500 Subject: [PATCH 02/14] Increased logger efficiency in Essentials. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/Essentials.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index f2247a182..39699a0da 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -27,20 +27,15 @@ import com.earth2me.essentials.user.UserMap; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.command.Command; -import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -230,7 +225,7 @@ public class Essentials extends JavaPlugin implements IEssentials final String timeroutput = execTimer.end(); if (getSettings().isDebug()) { - LOGGER.log(Level.INFO, "Essentials load " + timeroutput); + LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput); } } From aefe79bbe74dd8bf9a307509913cd5c387547300 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:00:27 -0500 Subject: [PATCH 03/14] Added @Override annotation in I18n. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/I18n.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java index c5fdaae50..7108254ff 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/com/earth2me/essentials/I18n.java @@ -44,6 +44,7 @@ public class I18n implements II18n instance = null; } + @Override public Locale getCurrentLocale() { return currentLocale; From 4203119e9a6118759e16a148161f8b632af12f50 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:02:55 -0500 Subject: [PATCH 04/14] Removed poor use of shadowing. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/Trade.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index 24c93b1a7..8062c00bd 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -115,21 +115,21 @@ public class Trade { final Map leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack()); final Location loc = user.getLocation(); - for (ItemStack itemStack : leftOver.values()) + for (ItemStack s : leftOver.values()) { - final int maxStackSize = itemStack.getType().getMaxStackSize(); - final int stacks = itemStack.getAmount() / maxStackSize; - final int leftover = itemStack.getAmount() % maxStackSize; + final int maxStackSize = s.getType().getMaxStackSize(); + final int stacks = s.getAmount() / maxStackSize; + final int leftover = s.getAmount() % maxStackSize; final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)]; for (int i = 0; i < stacks; i++) { - final ItemStack stack = itemStack.clone(); + final ItemStack stack = s.clone(); stack.setAmount(maxStackSize); itemStacks[i] = loc.getWorld().dropItem(loc, stack); } if (leftover > 0) { - final ItemStack stack = itemStack.clone(); + final ItemStack stack = s.clone(); stack.setAmount(leftover); itemStacks[stacks] = loc.getWorld().dropItem(loc, stack); } From 146599ae4becd768a7bfab037bcc32ef12eebce8 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:11:09 -0500 Subject: [PATCH 05/14] Formatting. Signed-off-by: Paul Buonopane --- .../src/com/earth2me/essentials/api/IEssentials.java | 9 ++++----- .../com/earth2me/essentials/api/IEssentialsModule.java | 1 + .../src/com/earth2me/essentials/api/IItemDb.java | 4 ++-- Essentials/src/com/earth2me/essentials/api/IKits.java | 10 +++++----- .../src/com/earth2me/essentials/api/IPermission.java | 4 ++-- .../src/com/earth2me/essentials/api/IReplyTo.java | 4 +++- .../src/com/earth2me/essentials/api/ITeleport.java | 2 +- Essentials/src/com/earth2me/essentials/api/IUser.java | 4 ++-- .../src/com/earth2me/essentials/api/IUserMap.java | 2 +- Essentials/src/com/earth2me/essentials/api/IWarp.java | 1 - .../earth2me/essentials/api/InvalidNameException.java | 1 - 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java index 175f55046..f5cbc8415 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java +++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java @@ -12,7 +12,7 @@ public interface IEssentials extends Plugin void addReloadListener(IReload listener); IUser getUser(Player player); - + IUser getUser(String playerName); int broadcastMessage(IUser sender, String message); @@ -24,7 +24,7 @@ public interface IEssentials extends Plugin IGroups getGroups(); IJails getJails(); - + IKits getKits(); IWarps getWarps(); @@ -36,7 +36,7 @@ public interface IEssentials extends Plugin IUserMap getUserMap(); IBackup getBackup(); - + ICommandHandler getCommandHandler(); World getWorld(String name); @@ -52,7 +52,6 @@ public interface IEssentials extends Plugin int scheduleSyncRepeatingTask(Runnable run, long delay, long period); //IPermissionsHandler getPermissionsHandler(); - void reload(); TNTExplodeListener getTNTListener(); @@ -60,6 +59,6 @@ public interface IEssentials extends Plugin void setGroups(IGroups groups); void removeReloadListener(IReload groups); - + IEconomy getEconomy(); } diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java b/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java index eea919f9d..cc185980a 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java +++ b/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.api; + public interface IEssentialsModule { } diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/com/earth2me/essentials/api/IItemDb.java index 5aa79f002..29f97488c 100644 --- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java +++ b/Essentials/src/com/earth2me/essentials/api/IItemDb.java @@ -6,8 +6,8 @@ import org.bukkit.inventory.ItemStack; public interface IItemDb extends IReload { ItemStack get(final String name, final IUser user) throws Exception; - + ItemStack get(final String name, final int quantity) throws Exception; - + ItemStack get(final String name) throws Exception; } diff --git a/Essentials/src/com/earth2me/essentials/api/IKits.java b/Essentials/src/com/earth2me/essentials/api/IKits.java index 1cf6f89ed..85ca4cdea 100644 --- a/Essentials/src/com/earth2me/essentials/api/IKits.java +++ b/Essentials/src/com/earth2me/essentials/api/IKits.java @@ -6,13 +6,13 @@ import java.util.Collection; public interface IKits extends IReload { - Kit getKit(String kit)throws Exception; - + Kit getKit(String kit) throws Exception; + void sendKit(IUser user, String kit) throws Exception; - + void sendKit(IUser user, Kit kit) throws Exception; - + Collection getList() throws Exception; - + boolean isEmpty(); } diff --git a/Essentials/src/com/earth2me/essentials/api/IPermission.java b/Essentials/src/com/earth2me/essentials/api/IPermission.java index e993ffe4d..d388bff47 100644 --- a/Essentials/src/com/earth2me/essentials/api/IPermission.java +++ b/Essentials/src/com/earth2me/essentials/api/IPermission.java @@ -8,10 +8,10 @@ import org.bukkit.permissions.PermissionDefault; public interface IPermission { String getPermission(); - + boolean isAuthorized(CommandSender sender); Permission getBukkitPermission(); - + PermissionDefault getPermissionDefault(); } diff --git a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java b/Essentials/src/com/earth2me/essentials/api/IReplyTo.java index c2a1deec5..3003ca3df 100644 --- a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java +++ b/Essentials/src/com/earth2me/essentials/api/IReplyTo.java @@ -2,7 +2,9 @@ package com.earth2me.essentials.api; import org.bukkit.command.CommandSender; -public interface IReplyTo { + +public interface IReplyTo +{ void setReplyTo(CommandSender user); CommandSender getReplyTo(); diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/com/earth2me/essentials/api/ITeleport.java index bcb018355..42dce4caa 100644 --- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java +++ b/Essentials/src/com/earth2me/essentials/api/ITeleport.java @@ -9,7 +9,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public interface ITeleport { void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception; - + void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception; void back(Trade chargeFor) throws Exception; diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/com/earth2me/essentials/api/IUser.java index 3a23d595d..e5a484389 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUser.java +++ b/Essentials/src/com/earth2me/essentials/api/IUser.java @@ -24,9 +24,9 @@ public interface IUser extends Player, IStorageObjectHolder, IReload, void giveMoney(double value); void giveMoney(double value, CommandSender initiator); - + void giveItems(ItemStack itemStack, Boolean canSpew) throws ChargeException; - + void giveItems(List itemStacks, Boolean canSpew) throws ChargeException; void setMoney(double value); diff --git a/Essentials/src/com/earth2me/essentials/api/IUserMap.java b/Essentials/src/com/earth2me/essentials/api/IUserMap.java index fd65b89d2..fbe6cfa0e 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUserMap.java +++ b/Essentials/src/com/earth2me/essentials/api/IUserMap.java @@ -10,7 +10,7 @@ public interface IUserMap extends IReload boolean userExists(final String name); IUser getUser(final Player player); - + IUser getUser(final String playerName); void removeUser(final String name) throws InvalidNameException; diff --git a/Essentials/src/com/earth2me/essentials/api/IWarp.java b/Essentials/src/com/earth2me/essentials/api/IWarp.java index 82669b52f..f08e5757d 100644 --- a/Essentials/src/com/earth2me/essentials/api/IWarp.java +++ b/Essentials/src/com/earth2me/essentials/api/IWarp.java @@ -6,5 +6,4 @@ import com.earth2me.essentials.storage.IStorageObjectHolder; public interface IWarp extends IStorageObjectHolder { - } diff --git a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java b/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java index 9f397ec20..951c66b17 100644 --- a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java +++ b/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.api; public class InvalidNameException extends Exception { - public InvalidNameException(Throwable thrwbl) { super(thrwbl); From 224e5f129eb4a18a46c063fc290a26abce247d9c Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:14:33 -0500 Subject: [PATCH 06/14] ChargeException was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/Trade.java | 1 + Essentials/src/com/earth2me/essentials/api/ChargeException.java | 2 +- Essentials/src/com/earth2me/essentials/api/IUser.java | 1 - .../src/com/earth2me/essentials/commands/Commandrepair.java | 2 +- Essentials/src/com/earth2me/essentials/user/User.java | 2 +- .../src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 2 +- .../src/com/earth2me/essentials/signs/EssentialsSign.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 2 +- .../src/com/earth2me/essentials/signs/SignEnchant.java | 2 +- .../src/com/earth2me/essentials/signs/SignGameMode.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java | 2 +- .../src/com/earth2me/essentials/signs/SignProtection.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java | 2 +- .../src/com/earth2me/essentials/signs/SignSpawnmob.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java | 2 +- .../src/com/earth2me/essentials/signs/SignTrade.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java | 2 +- .../src/com/earth2me/essentials/signs/SignWeather.java | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index 8062c00bd..ed99d0218 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -1,5 +1,6 @@ package com.earth2me.essentials; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.ISettings; diff --git a/Essentials/src/com/earth2me/essentials/api/ChargeException.java b/Essentials/src/com/earth2me/essentials/api/ChargeException.java index 2fa4c7289..5b157ce63 100644 --- a/Essentials/src/com/earth2me/essentials/api/ChargeException.java +++ b/Essentials/src/com/earth2me/essentials/api/ChargeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package com.earth2me.essentials.api; public class ChargeException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/com/earth2me/essentials/api/IUser.java index e5a484389..d4cb81f21 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUser.java +++ b/Essentials/src/com/earth2me/essentials/api/IUser.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.api; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.storage.IStorageObjectHolder; import com.earth2me.essentials.user.CooldownException; import com.earth2me.essentials.user.UserData; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java index efb29fce2..a135be491 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.Util; diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java index 56329e0ed..c371ec55c 100644 --- a/Essentials/src/com/earth2me/essentials/user/User.java +++ b/Essentials/src/com/earth2me/essentials/user/User.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.user; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Console; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Teleport; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index 0315408f7..c1f423e58 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.Util; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java index e5b0f0ba0..2a654600a 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.Util; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index e35e78b50..90deed418 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java index 3800c50de..e2ca49f1b 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Enchantments; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java index 0068cadf8..a61b378c1 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java index ba10f3586..8d4896a78 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java index b2a766223..f658f7e11 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java index 2ea488ec8..4b343c977 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.Util; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java index 4e16be23d..6efe0ea2a 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index 4c6d1238a..8a96fe25f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java index 8480a1d83..76bfb1105 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java index c57d94bb8..d72043f56 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.Util; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java index 744593e76..caabbfb04 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java index bc019b0cd..bac05a825 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; From a2fdf66de4db773ec9b898e7985bd6ee75ab8c21 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:18:29 -0500 Subject: [PATCH 07/14] Renamed TNT explosion listener to be more consistent with naming scheme. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/Essentials.java | 4 ++-- Essentials/src/com/earth2me/essentials/api/IEssentials.java | 4 ++-- .../{TNTExplodeListener.java => TntExplodeListener.java} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename Essentials/src/com/earth2me/essentials/listener/{TNTExplodeListener.java => TntExplodeListener.java} (91%) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 39699a0da..04afabdba 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -55,7 +55,7 @@ public class Essentials extends JavaPlugin implements IEssentials public static final int BUKKIT_VERSION = 1952; private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient ISettings settings; - private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); + private final transient TntExplodeListener tntListener = new TntExplodeListener(this); private transient IJails jails; private transient IKits kits; private transient IWarps warps; @@ -375,7 +375,7 @@ public class Essentials extends JavaPlugin implements IEssentials } @Override - public TNTExplodeListener getTNTListener() + public TntExplodeListener getTNTListener() { return tntListener; } diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java index f5cbc8415..7a793a1e7 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java +++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.api; -import com.earth2me.essentials.listener.TNTExplodeListener; +import com.earth2me.essentials.listener.TntExplodeListener; import com.earth2me.essentials.register.payment.Methods; import org.bukkit.World; import org.bukkit.entity.Player; @@ -54,7 +54,7 @@ public interface IEssentials extends Plugin //IPermissionsHandler getPermissionsHandler(); void reload(); - TNTExplodeListener getTNTListener(); + TntExplodeListener getTNTListener(); void setGroups(IGroups groups); diff --git a/Essentials/src/com/earth2me/essentials/listener/TNTExplodeListener.java b/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/listener/TNTExplodeListener.java rename to Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java index a16710617..2bcabb2d4 100644 --- a/Essentials/src/com/earth2me/essentials/listener/TNTExplodeListener.java +++ b/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java @@ -10,13 +10,13 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityExplodeEvent; -public class TNTExplodeListener implements Listener, Runnable +public class TntExplodeListener implements Listener, Runnable { private final transient IEssentials ess; private transient AtomicBoolean enabled = new AtomicBoolean(false); private transient int timer = -1; - public TNTExplodeListener(final IEssentials ess) + public TntExplodeListener(final IEssentials ess) { super(); this.ess = ess; From 9b25a25e91822a2b8003d749d83bc354ef4533da Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:21:26 -0500 Subject: [PATCH 08/14] Methods' applicable members are now static. Signed-off-by: Paul Buonopane --- .../essentials/listener/EssentialsPluginListener.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java index 8add570cd..39941b6f2 100644 --- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java +++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java @@ -5,6 +5,7 @@ import com.earth2me.essentials.api.IReload; import com.earth2me.essentials.api.ISettings; import com.earth2me.essentials.perm.GMGroups; import com.earth2me.essentials.perm.VaultGroups; +import com.earth2me.essentials.register.payment.Methods; import com.earth2me.essentials.settings.General; import com.earth2me.essentials.settings.GroupsHolder; import java.util.logging.Level; @@ -32,11 +33,11 @@ public class EssentialsPluginListener implements Listener, IReload checkGroups(); //ess.getPermissionsHandler().checkPermissions(); ess.getCommandHandler().addPlugin(event.getPlugin()); - if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager())) + if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) { ess.getLogger().log(Level.INFO, "Payment method found ({0} version: {1})", new Object[] { - ess.getPaymentMethod().getMethod().getName(), ess.getPaymentMethod().getMethod().getVersion() + Methods.getMethod().getName(), Methods.getMethod().getVersion() }); } } @@ -48,9 +49,9 @@ public class EssentialsPluginListener implements Listener, IReload //ess.getPermissionsHandler().checkPermissions(); ess.getCommandHandler().removePlugin(event.getPlugin()); // Check to see if the plugin thats being disabled is the one we are using - if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin())) + if (Methods.hasMethod() && Methods.checkDisabled(event.getPlugin())) { - ess.getPaymentMethod().reset(); + Methods.reset(); ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments."); } } From 53c92658000fb9d3d02ee947eef40bae27ca6471 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:24:46 -0500 Subject: [PATCH 09/14] Formatting. Signed-off-by: Paul Buonopane --- .../essentials/storage/IStorageObjectMap.java | 12 +++---- .../essentials/storage/IStorageReader.java | 2 +- .../earth2me/essentials/storage/Location.java | 16 ++++++---- .../essentials/storage/YamlStorageReader.java | 3 +- .../essentials/storage/YamlStorageWriter.java | 32 +++++++++---------- 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java b/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java index f23d4cc7b..788d80e65 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java +++ b/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java @@ -1,4 +1,3 @@ - package com.earth2me.essentials.storage; import com.earth2me.essentials.api.IReload; @@ -7,18 +6,17 @@ import java.io.File; import java.util.Set; - interface IStorageObjectMap extends IReload { boolean objectExists(final String name); - + I getObject(final String name); - + void removeObject(final String name) throws InvalidNameException; - + Set getAllKeys(); - + int getKeySize(); - + File getStorageFile(final String name) throws InvalidNameException; } diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java b/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java index d59adafe0..e92774809 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java +++ b/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java @@ -3,5 +3,5 @@ package com.earth2me.essentials.storage; public interface IStorageReader { - T load(final Class clazz) throws ObjectLoadException; + T load(final Class clazz) throws ObjectLoadException; } diff --git a/Essentials/src/com/earth2me/essentials/storage/Location.java b/Essentials/src/com/earth2me/essentials/storage/Location.java index 550a06ca4..6778027d7 100644 --- a/Essentials/src/com/earth2me/essentials/storage/Location.java +++ b/Essentials/src/com/earth2me/essentials/storage/Location.java @@ -38,7 +38,7 @@ public class Location this.yaw = yaw; this.pitch = pitch; } - + public Location(String worldname, double x, double y, double z) { this.worldname = worldname; @@ -56,13 +56,16 @@ public class Location if (loc == null) { World world = null; - if (worldUID != null) { + if (worldUID != null) + { world = Bukkit.getWorld(worldUID); } - if (world == null) { + if (world == null) + { world = Bukkit.getWorld(worldname); } - if (world == null) { + if (world == null) + { throw new WorldNotLoadedException(worldname); } loc = new org.bukkit.Location(world, getX(), getY(), getZ(), getYaw(), getPitch()); @@ -100,12 +103,13 @@ public class Location { return pitch; } - + + public static class WorldNotLoadedException extends Exception { public WorldNotLoadedException(String worldname) { - super("World "+worldname+" is not loaded."); + super("World " + worldname + " is not loaded."); } } } diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java b/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java index 5d1ff668a..ee7aa45cd 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java +++ b/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java @@ -45,7 +45,8 @@ public class YamlStorageReader implements IStorageReader try { T object = (T)yaml.load(reader); - if (object == null) { + if (object == null) + { object = clazz.newInstance(); } return object; diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java b/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java index cd9b04549..6e641db69 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java +++ b/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java @@ -23,12 +23,12 @@ public class YamlStorageWriter implements IStorageWriter private transient static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W"); private transient final PrintWriter writer; private transient static final Yaml YAML = new Yaml(); - + public YamlStorageWriter(final PrintWriter writer) { this.writer = writer; } - + @Override public void save(final StorageObject object) { @@ -45,7 +45,7 @@ public class YamlStorageWriter implements IStorageWriter Logger.getLogger(YamlStorageWriter.class.getName()).log(Level.SEVERE, null, ex); } } - + private void writeToFile(final Object object, final int depth, final Class clazz) throws IllegalAccessException { for (Field field : clazz.getDeclaredFields()) @@ -54,7 +54,7 @@ public class YamlStorageWriter implements IStorageWriter if (Modifier.isPrivate(modifier) && !Modifier.isTransient(modifier) && !Modifier.isStatic(modifier)) { field.setAccessible(true); - + final Object data = field.get(object); if (writeKey(field, depth, data)) { @@ -85,7 +85,7 @@ public class YamlStorageWriter implements IStorageWriter } } } - + private boolean writeKey(final Field field, final int depth, final Object data) { final boolean commentPresent = writeComment(field, depth); @@ -109,7 +109,7 @@ public class YamlStorageWriter implements IStorageWriter } return false; } - + private boolean writeComment(final Field field, final int depth) { final boolean commentPresent = field.isAnnotationPresent(Comment.class); @@ -131,7 +131,7 @@ public class YamlStorageWriter implements IStorageWriter } return commentPresent; } - + private void writeCollection(final Collection data, final int depth) throws IllegalAccessException { writer.println(); @@ -162,7 +162,7 @@ public class YamlStorageWriter implements IStorageWriter } writer.println(); } - + private void writeMap(final Map data, final int depth) throws IllegalArgumentException, IllegalAccessException { writer.println(); @@ -199,7 +199,7 @@ public class YamlStorageWriter implements IStorageWriter } } } - + private void writeIndention(final int depth) { for (int i = 0; i < depth; i++) @@ -207,7 +207,7 @@ public class YamlStorageWriter implements IStorageWriter writer.print(" "); } } - + private void writeScalar(final Object data) { if (data instanceof String || data instanceof Boolean || data instanceof Number) @@ -247,7 +247,7 @@ public class YamlStorageWriter implements IStorageWriter throw new UnsupportedOperationException(); } } - + private void writeKey(final Object data) { if (data instanceof String || data instanceof Boolean || data instanceof Number) @@ -285,12 +285,12 @@ public class YamlStorageWriter implements IStorageWriter throw new UnsupportedOperationException(); } } - + private void writeMaterial(final Object data) { writer.print(data.toString().toLowerCase(Locale.ENGLISH)); } - + private void writeMaterialData(final Object data) { final MaterialData matData = (MaterialData)data; @@ -301,7 +301,7 @@ public class YamlStorageWriter implements IStorageWriter writer.print(matData.getData()); } } - + private void writeItemStack(final Object data) { final ItemStack itemStack = (ItemStack)data; @@ -314,7 +314,7 @@ public class YamlStorageWriter implements IStorageWriter writeEnchantmentLevel(entry); } } - + private void writeEnchantmentLevel(Object data) { final Entry enchLevel = (Entry)data; @@ -322,7 +322,7 @@ public class YamlStorageWriter implements IStorageWriter writer.print(':'); writer.print(enchLevel.getValue()); } - + private void writeLocation(final Location entry, final int depth) { writer.println(); From 8c5d4d83f1152c68528ce06b7e31c18c19050d64 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:26:10 -0500 Subject: [PATCH 10/14] Avoided shadowing. Signed-off-by: Paul Buonopane --- .../com/earth2me/essentials/storage/EnchantmentLevel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java b/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java index a664929f3..2eb062ae8 100644 --- a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java +++ b/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java @@ -70,9 +70,9 @@ public class EnchantmentLevel implements Entry if (entry.getKey() instanceof Enchantment && entry.getValue() instanceof Integer) { - final Enchantment enchantment = (Enchantment)entry.getKey(); - final Integer level = (Integer)entry.getValue(); - return this.enchantment.equals(enchantment) && this.level == level.intValue(); + final Enchantment objEnchantment = (Enchantment)entry.getKey(); + final Integer objLevel = (Integer)entry.getValue(); + return enchantment.equals(objEnchantment) && level == objLevel.intValue(); } } return false; From a865c9ad01cd8b709d03674270933ed7349d9898 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:26:55 -0500 Subject: [PATCH 11/14] Formatting. Signed-off-by: Paul Buonopane --- .../earth2me/essentials/storage/BukkitConstructor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java index 9d140a85f..93412be56 100644 --- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java +++ b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java @@ -210,7 +210,8 @@ public class BukkitConstructor extends Constructor } return new EnchantmentLevel(enchant, level); } - if (node.getType().isEnum()) { + if (node.getType().isEnum()) + { final String val = (String)constructScalar((ScalarNode)node); if (val.isEmpty()) { @@ -218,7 +219,8 @@ public class BukkitConstructor extends Constructor } for (Object object : node.getType().getEnumConstants()) { - if (object.toString().equalsIgnoreCase(val)) { + if (object.toString().equalsIgnoreCase(val)) + { return object; } } @@ -292,7 +294,8 @@ public class BukkitConstructor extends Constructor final Field typeDefField = Constructor.class.getDeclaredField("typeDefinitions"); typeDefField.setAccessible(true); typeDefinitions = (Map, TypeDescription>)typeDefField.get((Constructor)BukkitConstructor.this); - if (typeDefinitions == null) { + if (typeDefinitions == null) + { throw new NullPointerException(); } } From 0039f73fb3709f1cc1d26b057f2355ee986eefaa Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:27:23 -0500 Subject: [PATCH 12/14] Better use of logger. Signed-off-by: Paul Buonopane --- .../essentials/storage/AbstractDelayedYamlFileReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java index a559684b8..cad08b8c1 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java @@ -69,7 +69,7 @@ public abstract class AbstractDelayedYamlFileReader imp catch (FileNotFoundException ex) { onException(ex); - Bukkit.getLogger().log(Level.INFO, "File not found: " + file.toString()); + Bukkit.getLogger().log(Level.INFO, "File not found: {0}", file.toString()); } catch (ObjectLoadException ex) { From 1cbb6f1617d54fa341ca19054c8d843e5a7de774 Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:29:49 -0500 Subject: [PATCH 13/14] ManagedFile was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/ItemDb.java | 1 + Essentials/src/com/earth2me/essentials/storage/ManagedFile.java | 2 +- .../src/com/earth2me/essentials/EssentialsUpgrade.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/com/earth2me/essentials/ItemDb.java index 49ab64ea4..22c08d294 100644 --- a/Essentials/src/com/earth2me/essentials/ItemDb.java +++ b/Essentials/src/com/earth2me/essentials/ItemDb.java @@ -1,5 +1,6 @@ package com.earth2me.essentials; +import com.earth2me.essentials.storage.ManagedFile; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IItemDb; diff --git a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java b/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java index 0a2443f29..509783955 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java +++ b/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package com.earth2me.essentials.storage; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java index 9338559cb..a8c85f956 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -1,5 +1,6 @@ package com.earth2me.essentials; +import com.earth2me.essentials.storage.ManagedFile; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.settings.Spawns; From d06fc84e41eb8743754255085328a4decb920dce Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:46:57 -0500 Subject: [PATCH 14/14] Changed s to dropStack for verbosity, and organized imports. Signed-off-by: Paul Buonopane --- Essentials/src/com/earth2me/essentials/Trade.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index ed99d0218..e9dc9f78a 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -1,7 +1,7 @@ package com.earth2me.essentials; -import com.earth2me.essentials.api.ChargeException; import static com.earth2me.essentials.I18n._; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.ISettings; import com.earth2me.essentials.api.IUser; @@ -116,21 +116,21 @@ public class Trade { final Map leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack()); final Location loc = user.getLocation(); - for (ItemStack s : leftOver.values()) + for (ItemStack dropStack : leftOver.values()) { - final int maxStackSize = s.getType().getMaxStackSize(); - final int stacks = s.getAmount() / maxStackSize; - final int leftover = s.getAmount() % maxStackSize; + final int maxStackSize = dropStack.getType().getMaxStackSize(); + final int stacks = dropStack.getAmount() / maxStackSize; + final int leftover = dropStack.getAmount() % maxStackSize; final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)]; for (int i = 0; i < stacks; i++) { - final ItemStack stack = s.clone(); + final ItemStack stack = dropStack.clone(); stack.setAmount(maxStackSize); itemStacks[i] = loc.getWorld().dropItem(loc, stack); } if (leftover > 0) { - final ItemStack stack = s.clone(); + final ItemStack stack = dropStack.clone(); stack.setAmount(leftover); itemStacks[stacks] = loc.getWorld().dropItem(loc, stack); }