Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-06-23 21:04:46 +02:00
Code Issues Projects Releases Wiki Activity

Moved packages and fixed logging

Browse Source 
Moved packages in a more logical order.
Fixed TransactionLogger using only event.getStock()[0] while logging the
transaction.
Also, TransactionLogger uses string formatter now, instead of a
StringBuilder.
This commit is contained in:
Acrobot 2012-08-10 21:44:32 +02:00
parent aa60c7caab
commit 30fa329645
15 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
com/Acrobot/ChestShop/ChestShop.java
View File

@ -15,12 +15,12 @@ import com.Acrobot.ChestShop.Listeners.ItemInfoListener;
import com.Acrobot.ChestShop.Listeners.Player.PlayerConnect;
import com.Acrobot.ChestShop.Listeners.Player.PlayerInteract;
import com.Acrobot.ChestShop.Listeners.Player.ShortNameSaver;
import com.Acrobot.ChestShop.Listeners.Shop.PostTransaction.EconomicModule;
import com.Acrobot.ChestShop.Listeners.Shop.PostTransaction.ItemManager;
import com.Acrobot.ChestShop.Listeners.Shop.PreTransaction.*;
import com.Acrobot.ChestShop.Listeners.Shop.PostTransaction.EmptyShopDeleter;
import com.Acrobot.ChestShop.Listeners.Shop.PostTransaction.TransactionLogger;
import com.Acrobot.ChestShop.Listeners.Shop.PostTransaction.TransactionMessageSender;
import com.Acrobot.ChestShop.Listeners.PostTransaction.EconomicModule;
import com.Acrobot.ChestShop.Listeners.PostTransaction.ItemManager;
import com.Acrobot.ChestShop.Listeners.PreTransaction.*;
import com.Acrobot.ChestShop.Listeners.PostTransaction.EmptyShopDeleter;
import com.Acrobot.ChestShop.Listeners.PostTransaction.TransactionLogger;
import com.Acrobot.ChestShop.Listeners.PostTransaction.TransactionMessageSender;
import com.Acrobot.ChestShop.Logging.FileFormatter;
import com.Acrobot.ChestShop.Signs.RestrictedSign;
import com.avaje.ebean.EbeanServer;

2
com/Acrobot/ChestShop/Listeners/Shop/PostTransaction/EconomicModule.java → com/Acrobot/ChestShop/Listeners/PostTransaction/EconomicModule.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PostTransaction;
package com.Acrobot.ChestShop.Listeners.PostTransaction;
import com.Acrobot.ChestShop.Economy.Economy;
import com.Acrobot.ChestShop.Events.TransactionEvent;

2
com/Acrobot/ChestShop/Listeners/Shop/PostTransaction/EmptyShopDeleter.java → com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PostTransaction;
package com.Acrobot.ChestShop.Listeners.PostTransaction;
import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Config.Property;

2
com/Acrobot/ChestShop/Listeners/Shop/PostTransaction/ItemManager.java → com/Acrobot/ChestShop/Listeners/PostTransaction/ItemManager.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PostTransaction;
package com.Acrobot.ChestShop.Listeners.PostTransaction;
import com.Acrobot.Breeze.Utils.InventoryUtil;
import com.Acrobot.ChestShop.Events.TransactionEvent;

37
com/Acrobot/ChestShop/Listeners/Shop/PostTransaction/TransactionLogger.java → com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PostTransaction;
package com.Acrobot.ChestShop.Listeners.PostTransaction;
import com.Acrobot.ChestShop.ChestShop;
import com.Acrobot.ChestShop.Config.Config;
@ -19,34 +19,27 @@ import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.BUY;
* @author Acrobot
*/
public class TransactionLogger implements Listener {
private static final String BUY_MESSAGE = "%1$s bought %2$s for %3$.2f from %4$s at %5$s";
private static final String SELL_MESSAGE = "%1$s sold %2$s for %3$.2f to %4$s at %5$s";
@EventHandler
public static void onTransaction(TransactionEvent event) {
StringBuilder message = new StringBuilder(70);
String template = (event.getTransactionType() == BUY ? BUY_MESSAGE : SELL_MESSAGE);
message.append(event.getClient().getName());
if (event.getTransactionType() == BUY) {
message.append(" bought ");
} else {
message.append(" sold ");
}
StringBuilder items = new StringBuilder(50);
for (ItemStack item : event.getStock()) {
message.append(item.getAmount()).append(' ').append(getSignName(item));
items.append(item.getAmount()).append(' ').append(getSignName(item));
}
message.append(" for ").append(event.getPrice());
String message = String.format(template,
event.getClient().getName(),
items.toString(),
event.getPrice(),
event.getOwner().getName(),
locationToString(event.getSign().getLocation()));
if (event.getTransactionType() == BUY) {
message.append(" from ");
} else {
message.append(" to ");
}
message.append(event.getOwner()).append(' ');
message.append(locationToString(event.getSign().getLocation()));
ChestShop.getBukkitLogger().info(message.toString());
ChestShop.getBukkitLogger().info(message);
}
@EventHandler
@ -60,7 +53,7 @@ public class TransactionLogger implements Listener {
for (ItemStack item : event.getStock()) {
Transaction transaction = new Transaction();
transaction.setAmount(event.getStock()[0].getAmount());
transaction.setAmount(item.getAmount());
transaction.setItemID(item.getTypeId());
transaction.setItemDurability(item.getDurability());

2
com/Acrobot/ChestShop/Listeners/Shop/PostTransaction/TransactionMessageSender.java → com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PostTransaction;
package com.Acrobot.ChestShop.Listeners.PostTransaction;
import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Config.Language;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/AmountAndPriceChecker.java → com/Acrobot/ChestShop/Listeners/PreTransaction/AmountAndPriceChecker.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.Breeze.Utils.InventoryUtil;
import com.Acrobot.ChestShop.Economy.Economy;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/CreativeModeIgnorer.java → com/Acrobot/ChestShop/Listeners/PreTransaction/CreativeModeIgnorer.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/ErrorMessageSender.java → com/Acrobot/ChestShop/Listeners/PreTransaction/ErrorMessageSender.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Config.Config;
import com.Acrobot.ChestShop.Config.Language;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/PartialTransactionModule.java → com/Acrobot/ChestShop/Listeners/PreTransaction/PartialTransactionModule.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.Breeze.Utils.InventoryUtil;
import com.Acrobot.Breeze.Utils.MaterialUtil;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/PermissionChecker.java → com/Acrobot/ChestShop/Listeners/PreTransaction/PermissionChecker.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
import com.Acrobot.ChestShop.Events.TransactionEvent;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/PriceValidator.java → com/Acrobot/ChestShop/Listeners/PreTransaction/PriceValidator.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.Breeze.Utils.PriceUtil;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/ShopValidator.java → com/Acrobot/ChestShop/Listeners/PreTransaction/ShopValidator.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
import com.Acrobot.ChestShop.Signs.ChestShopSign;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/SpamClickProtector.java → com/Acrobot/ChestShop/Listeners/PreTransaction/SpamClickProtector.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
import org.bukkit.entity.Player;

2
com/Acrobot/ChestShop/Listeners/Shop/PreTransaction/StockFittingChecker.java → com/Acrobot/ChestShop/Listeners/PreTransaction/StockFittingChecker.java
View File

@ -1,4 +1,4 @@
package com.Acrobot.ChestShop.Listeners.Shop.PreTransaction;
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.Breeze.Utils.InventoryUtil;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;