Upstream/ShopChest-Updated
1
0
Fork 0
mirror of https://github.com/Flowsqy/ShopChest.git synced 2024-11-14 23:15:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added comments to shop creation command method

Browse Source
This commit is contained in:
Eric 2017-05-23 13:59:13 +02:00
parent 428d48e5fc
commit 4b4cfb3c0f
2 changed files with 63 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/main/java/de/epiceric/shopchest/ShopCommand.java
View File

@ -174,7 +174,6 @@ class ShopCommand implements CommandExecutor {
} }
} }
if (needsHelp) sendBasicHelpMessage(sender); if (needsHelp) sendBasicHelpMessage(sender);
return true; return true;
} }
@ -275,114 +274,92 @@ class ShopCommand implements CommandExecutor {
int amount; int amount;
double buyPrice, sellPrice; double buyPrice, sellPrice;
// Check for limits
int limit = shopUtils.getShopLimit(p); int limit = shopUtils.getShopLimit(p);
if (limit != -1) { if (limit != -1) {
if (shopUtils.getShopAmount(p) >= limit) { if (shopUtils.getShopAmount(p) >= limit) {
if (shopType != ShopType.ADMIN || !plugin.getShopChestConfig().exclude_admin_shops) { if (shopType != ShopType.ADMIN || !plugin.getShopChestConfig().exclude_admin_shops) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_LIMIT_REACHED, new LocalizedMessage.ReplacedRegex(Regex.LIMIT, String.valueOf(limit)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_LIMIT_REACHED, new LocalizedMessage.ReplacedRegex(Regex.LIMIT, String.valueOf(limit))));
plugin.debug(p.getName() + " has reached the limit");
return; return;
} }
} }
} }
plugin.debug(p.getName() + " has not reached the limit"); // Check if amount and prices are valid
try { try {
amount = Integer.parseInt(args[1]); amount = Integer.parseInt(args[1]);
buyPrice = Double.parseDouble(args[2]); buyPrice = Double.parseDouble(args[2]);
sellPrice = Double.parseDouble(args[3]); sellPrice = Double.parseDouble(args[3]);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.AMOUNT_PRICE_NOT_NUMBER)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.AMOUNT_PRICE_NOT_NUMBER));
plugin.debug(p.getName() + " has entered an invalid amount");
return; return;
} }
if (amount <= 0) { if (amount <= 0) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.AMOUNT_IS_ZERO)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.AMOUNT_IS_ZERO));
plugin.debug(p.getName() + " has entered an invalid amount");
return; return;
} }
plugin.debug(p.getName() + " has entered numbers as prices and amount");
if (!plugin.getShopChestConfig().allow_decimals_in_price && (buyPrice != (int) buyPrice || sellPrice != (int) sellPrice)) { if (!plugin.getShopChestConfig().allow_decimals_in_price && (buyPrice != (int) buyPrice || sellPrice != (int) sellPrice)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.PRICES_CONTAIN_DECIMALS)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.PRICES_CONTAIN_DECIMALS));
plugin.debug(p.getName() + " has entered an invalid price");
return; return;
} }
plugin.debug(p.getName() + " has entered the numbers correctly (according to allow-decimals configuration)");
boolean buyEnabled = buyPrice > 0; boolean buyEnabled = buyPrice > 0;
boolean sellEnabled = sellPrice > 0; boolean sellEnabled = sellPrice > 0;
if (!buyEnabled && !sellEnabled) { if (!buyEnabled && !sellEnabled) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_SELL_DISABLED)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_SELL_DISABLED));
plugin.debug(p.getName() + " has disabled buying and selling");
return; return;
} }
plugin.debug(p.getName() + " has enabled buying, selling or both"); ItemStack inHand = Utils.getPreferredItemInHand(p);
if (Utils.getPreferredItemInHand(p) == null) { // Check if item in hand
if (inHand == null) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_ITEM_IN_HAND)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_ITEM_IN_HAND));
plugin.debug(p.getName() + " does not have an item in his hand");
return; return;
} }
plugin.debug(p.getName() + " has an item in his hand"); // Check if item on blacklist
for (String item : plugin.getShopChestConfig().blacklist) { for (String item : plugin.getShopChestConfig().blacklist) {
ItemStack itemStack; ItemStack itemStack = ItemUtils.getItemStack(item);
if (item.contains(":")) { if (itemStack == null) {
Material mat = Material.getMaterial(item.split(":")[0]); plugin.getLogger().warning("Invalid item found in blacklist: " + item);
if (mat == null) { plugin.debug("Invalid item in blacklist: " + item);
plugin.getLogger().warning("Invalid item found in blacklist: " + item); continue;
plugin.debug("Invalid item in blacklist: " + item);
continue;
}
itemStack = new ItemStack(mat, 1, Short.parseShort(item.split(":")[1]));
} else {
Material mat = Material.getMaterial(item);
if (mat == null) {
plugin.getLogger().warning("Invalid item found in blacklist: " + item);
plugin.debug("Invalid item in blacklist: " + item);
continue;
}
itemStack = new ItemStack(mat, 1);
} }
if (itemStack.getType().equals(Utils.getPreferredItemInHand(p).getType()) && itemStack.getDurability() == Utils.getPreferredItemInHand(p).getDurability()) { if (itemStack.getType().equals(inHand.getType()) && itemStack.getDurability() == inHand.getDurability()) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CANNOT_SELL_ITEM)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CANNOT_SELL_ITEM));
plugin.debug(p.getName() + "'s item is on the blacklist");
return; return;
} }
} }
plugin.debug(p.getName() + "'s item is not on the blacklist"); // Check if prices lower than minimum price
for (String key : plugin.getShopChestConfig().minimum_prices) { for (String key : plugin.getShopChestConfig().minimum_prices) {
ItemStack itemStack; ItemStack itemStack = ItemUtils.getItemStack(key);
double minPrice = plugin.getConfig().getDouble("minimum-prices." + key); double minPrice = plugin.getConfig().getDouble("minimum-prices." + key);
if (key.contains(":")) { if (itemStack == null) {
Material mat = Material.getMaterial(key.split(":")[0]); plugin.getLogger().warning("Invalid item found in minimum-prices: " + key);
if (mat == null) { plugin.debug("Invalid item in minimum-prices: " + key);
plugin.getLogger().warning("Invalid item found in minimum-prices: " + key); continue;
plugin.debug("Invalid item in minimum-prices: " + key);
continue;
}
itemStack = new ItemStack(mat, 1, Short.parseShort(key.split(":")[1]));
} else {
Material mat = Material.getMaterial(key);
if (mat == null) {
plugin.getLogger().warning("Invalid item found in minimum-prices: " + key);
plugin.debug("Invalid item in minimum-prices: " + key);
continue;
}
itemStack = new ItemStack(mat, 1);
} }
if (itemStack.getType().equals(Utils.getPreferredItemInHand(p).getType()) && itemStack.getDurability() == Utils.getPreferredItemInHand(p).getDurability()) { if (itemStack.getType().equals(inHand.getType()) && itemStack.getDurability() == inHand.getDurability()) {
if (buyEnabled) { if (buyEnabled) {
if ((buyPrice < amount * minPrice) && (buyPrice > 0)) { if ((buyPrice < amount * minPrice) && (buyPrice > 0)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(amount * minPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(amount * minPrice))));
plugin.debug(p.getName() + "'s buy price is lower than the minimum");
return; return;
} }
} }
@ -390,40 +367,29 @@ class ShopCommand implements CommandExecutor {
if (sellEnabled) { if (sellEnabled) {
if ((sellPrice < amount * minPrice) && (sellPrice > 0)) { if ((sellPrice < amount * minPrice) && (sellPrice > 0)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(amount * minPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(amount * minPrice))));
plugin.debug(p.getName() + "'s sell price is lower than the minimum");
return; return;
} }
} }
} }
} }
plugin.debug(p.getName() + "'s prices are higher than the minimum"); // Check if prices higher than maximum price
for (String key : plugin.getShopChestConfig().maximum_prices) { for (String key : plugin.getShopChestConfig().maximum_prices) {
ItemStack itemStack; ItemStack itemStack = ItemUtils.getItemStack(key);
double maxPrice = plugin.getConfig().getDouble("maximum-prices." + key); double maxPrice = plugin.getConfig().getDouble("maximum-prices." + key);
if (key.contains(":")) { if (itemStack == null) {
Material mat = Material.getMaterial(key.split(":")[0]); plugin.getLogger().warning("Invalid item found in maximum-prices: " + key);
if (mat == null) { plugin.debug("Invalid item in maximum-prices: " + key);
plugin.getLogger().warning("Invalid item found in maximum-prices: " + key); continue;
plugin.debug("Invalid item in maximum-prices: " + key);
continue;
}
itemStack = new ItemStack(mat, 1, Short.parseShort(key.split(":")[1]));
} else {
Material mat = Material.getMaterial(key);
if (mat == null) {
plugin.getLogger().warning("Invalid item found in maximum-prices: " + key);
plugin.debug("Invalid item in maximum-prices: " + key);
continue;
}
itemStack = new ItemStack(mat, 1);
} }
if (itemStack.getType().equals(Utils.getPreferredItemInHand(p).getType()) && itemStack.getDurability() == Utils.getPreferredItemInHand(p).getDurability()) { if (itemStack.getType().equals(inHand.getType()) && itemStack.getDurability() == inHand.getDurability()) {
if (buyEnabled) { if (buyEnabled) {
if ((buyPrice > amount * maxPrice) && (buyPrice > 0)) { if ((buyPrice > amount * maxPrice) && (buyPrice > 0)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_HIGH, new LocalizedMessage.ReplacedRegex(Regex.MAX_PRICE, String.valueOf(amount * maxPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_HIGH, new LocalizedMessage.ReplacedRegex(Regex.MAX_PRICE, String.valueOf(amount * maxPrice))));
plugin.debug(p.getName() + "'s buy price is higher than the maximum");
return; return;
} }
} }
@ -431,52 +397,49 @@ class ShopCommand implements CommandExecutor {
if (sellEnabled) { if (sellEnabled) {
if ((sellPrice > amount * maxPrice) && (sellPrice > 0)) { if ((sellPrice > amount * maxPrice) && (sellPrice > 0)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_PRICE_TOO_HIGH, new LocalizedMessage.ReplacedRegex(Regex.MAX_PRICE, String.valueOf(amount * maxPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_PRICE_TOO_HIGH, new LocalizedMessage.ReplacedRegex(Regex.MAX_PRICE, String.valueOf(amount * maxPrice))));
plugin.debug(p.getName() + "'s sell price is higher than the maximum");
return; return;
} }
} }
} }
} }
plugin.debug(p.getName() + "'s prices are lower than the maximum");
if (sellEnabled && buyEnabled) { if (sellEnabled && buyEnabled) {
if (plugin.getShopChestConfig().buy_greater_or_equal_sell) { if (plugin.getShopChestConfig().buy_greater_or_equal_sell) {
if (buyPrice < sellPrice) { if (buyPrice < sellPrice) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(sellPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_PRICE_TOO_LOW, new LocalizedMessage.ReplacedRegex(Regex.MIN_PRICE, String.valueOf(sellPrice))));
plugin.debug(p.getName() + "'s buy price is lower than the sell price");
return; return;
} }
} }
} }
plugin.debug(p.getName() + "'s buy price is high enough"); ItemStack product = new ItemStack(inHand.getType(), amount, inHand.getDurability());
product.setItemMeta(inHand.getItemMeta());
ItemStack itemStack = new ItemStack(Utils.getPreferredItemInHand(p).getType(), amount, Utils.getPreferredItemInHand(p).getDurability()); if (Enchantment.DURABILITY.canEnchantItem(product)) {
itemStack.setItemMeta(Utils.getPreferredItemInHand(p).getItemMeta()); if (product.getDurability() > 0 && !plugin.getShopChestConfig().allow_broken_items) {
if (Enchantment.DURABILITY.canEnchantItem(itemStack)) {
if (itemStack.getDurability() > 0 && !plugin.getShopChestConfig().allow_broken_items) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CANNOT_SELL_BROKEN_ITEM)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CANNOT_SELL_BROKEN_ITEM));
plugin.debug(p.getName() + "'s item is broken");
return; return;
} }
} }
plugin.debug(p.getName() + "'s item is not broken (or broken items are allowed through config)");
double creationPrice = (shopType == ShopType.NORMAL) ? plugin.getShopChestConfig().shop_creation_price_normal : plugin.getShopChestConfig().shop_creation_price_admin; double creationPrice = (shopType == ShopType.NORMAL) ? plugin.getShopChestConfig().shop_creation_price_normal : plugin.getShopChestConfig().shop_creation_price_admin;
if (creationPrice > 0) { if (creationPrice > 0) {
if (plugin.getEconomy().getBalance(p) < creationPrice) { if (plugin.getEconomy().getBalance(p) < creationPrice) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_CREATE_NOT_ENOUGH_MONEY, new LocalizedMessage.ReplacedRegex(Regex.CREATION_PRICE, String.valueOf(creationPrice)))); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_CREATE_NOT_ENOUGH_MONEY, new LocalizedMessage.ReplacedRegex(Regex.CREATION_PRICE, String.valueOf(creationPrice))));
plugin.debug(p.getName() + " can not pay the creation price");
return; return;
} }
} }
plugin.debug(p.getName() + " can pay the creation price"); ShopPreCreateEvent event = new ShopPreCreateEvent(p, new Shop(plugin, p, product, null, buyPrice, sellPrice, shopType));
ShopPreCreateEvent event = new ShopPreCreateEvent(p, new Shop(plugin, p, itemStack, null, buyPrice, sellPrice, shopType));
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
ClickType.setPlayerClickType(p, new ClickType(EnumClickType.CREATE, itemStack, buyPrice, sellPrice, shopType)); ClickType.setPlayerClickType(p, new ClickType(EnumClickType.CREATE, product, buyPrice, sellPrice, shopType));
plugin.debug(p.getName() + " can now click a chest"); plugin.debug(p.getName() + " can now click a chest");
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CLICK_CHEST_CREATE)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CLICK_CHEST_CREATE));
} else { } else {

17
src/main/java/de/epiceric/shopchest/utils/ItemUtils.java
View File

@ -68,4 +68,21 @@ public class ItemUtils {
return null; return null;
} }
/**
* Get the {@link ItemStack} from a String
* @param item Serialized ItemStack e.g. {@code "STONE"} or {@code "STONE:1"}
* @return The de-serialized ItemStack or {@code null} if the serialized item is invalid
*/
public static ItemStack getItemStack(String item) {
if (item.contains(":")) {
Material mat = Material.getMaterial(item.split(":")[0]);
if (mat == null) return null;
return new ItemStack(mat, 1, Short.parseShort(item.split(":")[1]));
} else {
Material mat = Material.getMaterial(item);
if (mat == null) return null;
return new ItemStack(mat, 1);
}
}
} }