diff --git a/config.yml b/config.yml index fb2dbe0..04fdfe6 100644 --- a/config.yml +++ b/config.yml @@ -141,10 +141,7 @@ messages: # If the sell price or buy price is disabled, this message will be displayed instead of the price and the currency symbol in the message above. disabled: "&7Disabled&e" - # Set the infinite message the player gets after entering '/shop info' ... - # ... when the shop is infinite. - is-infinite: "&6Type: &eInfinite" - + # Set the type message the player gets after entering '/shop info' ... # ... when the shop is normal. is-normal: "&6Type: &eNormal" @@ -298,9 +295,6 @@ messages: # Set the message when a not permitted player tries to create a shop. create: "&cYou don't have permission to create a shop." - # Set the message when a not permitted player tries to create an infinite shop. - create-infinite: "&cYou don't have permission to create an infinite shop." - # Set the message when a not permitted player tries to create an admin shop. create-admin: "&cYou don't have permission to create an admin shop." diff --git a/plugin.yml b/plugin.yml index 43c6c12..c6aa65a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -14,7 +14,6 @@ permissions: description: Gives access to all ShopChest permissions. children: shopchest.create: true - shopchest.create.infinite: true shopchest.removeOther: true shopchest.buy: true shopchest.openOther: true @@ -25,11 +24,6 @@ permissions: shopchest.create: description: Allows you to create a shop. default: true - shopchest.create.infinite: - description: Allows you to create an infinite shop. - children: - shopchest.create: true - default: op shopchest.create.admin: description: Allows you to create an admin shop. children: diff --git a/src/de/epiceric/shopchest/Commands.java b/src/de/epiceric/shopchest/Commands.java index 934490e..eb53ae0 100644 --- a/src/de/epiceric/shopchest/Commands.java +++ b/src/de/epiceric/shopchest/Commands.java @@ -57,15 +57,7 @@ public class Commands extends BukkitCommand { create(args, ShopType.NORMAL, p); return true; } else if (args.length == 5) { - if (args[4].equalsIgnoreCase("infinite")) { - if (perm.has(p, "shopchest.create.infinite")) { - create(args, ShopType.INFINITE, p); - return true; - } else { - p.sendMessage(Config.noPermission_createInfinite()); - return true; - } - } else if (args[4].equalsIgnoreCase("normal")) { + if (args[4].equalsIgnoreCase("normal")) { create(args, ShopType.NORMAL, p); return true; } else if (args[4].equalsIgnoreCase("admin")) { @@ -305,7 +297,7 @@ public class Commands extends BukkitCommand { } private void sendBasicHelpMessage(Player player) { - player.sendMessage(ChatColor.GREEN + "/" + Config.main_command_name() + " create [infinite|normal|admin] - " + Config.cmdDesc_create()); + player.sendMessage(ChatColor.GREEN + "/" + Config.main_command_name() + " create [normal|admin] - " + Config.cmdDesc_create()); player.sendMessage(ChatColor.GREEN + "/" + Config.main_command_name() + " remove - " + Config.cmdDesc_remove()); player.sendMessage(ChatColor.GREEN + "/" + Config.main_command_name() + " info - " + Config.cmdDesc_info()); player.sendMessage(ChatColor.GREEN + "/" + Config.main_command_name() + " reload - " + Config.cmdDesc_reload()); diff --git a/src/de/epiceric/shopchest/ShopChest.java b/src/de/epiceric/shopchest/ShopChest.java index 55cfdd5..24b77fb 100644 --- a/src/de/epiceric/shopchest/ShopChest.java +++ b/src/de/epiceric/shopchest/ShopChest.java @@ -82,21 +82,6 @@ public class ShopChest extends JavaPlugin { try { Metrics metrics = new Metrics(this); Graph shopType = metrics.createGraph("Shop Type"); - - shopType.addPlotter(new Plotter("Infinite") { - - @Override - public int getValue() { - int value = 0; - - for (Shop shop : ShopUtils.getShops()) { - if (shop.getShopType() == ShopType.INFINITE) value++; - } - - return value; - } - }); - shopType.addPlotter(new Plotter("Normal") { @Override diff --git a/src/de/epiceric/shopchest/config/Config.java b/src/de/epiceric/shopchest/config/Config.java index cd07084..c6517b1 100644 --- a/src/de/epiceric/shopchest/config/Config.java +++ b/src/de/epiceric/shopchest/config/Config.java @@ -147,10 +147,6 @@ public class Config { return plugin.getConfig().getString("messages.command-description.limits").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); } - public static String shopInfo_isInfinite() { - return plugin.getConfig().getString("messages.shop-info.is-infinite").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); - } - public static String shopInfo_isNormal() { return plugin.getConfig().getString("messages.shop-info.is-normal").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); } @@ -163,10 +159,6 @@ public class Config { return plugin.getConfig().getString("messages.no-permission.create").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); } - public static String noPermission_createInfinite() { - return plugin.getConfig().getString("messages.no-permission.create-infinite").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); - } - public static String noPermission_createAdmin() { return plugin.getConfig().getString("messages.no-permission.create-admin").replaceAll("(&([a-f0-9k-or]))", "\u00A7$2"); } diff --git a/src/de/epiceric/shopchest/event/InteractShop.java b/src/de/epiceric/shopchest/event/InteractShop.java index 77e1927..89651e5 100644 --- a/src/de/epiceric/shopchest/event/InteractShop.java +++ b/src/de/epiceric/shopchest/event/InteractShop.java @@ -155,13 +155,7 @@ public class InteractShop implements Listener { } else { if (shop.getBuyPrice() > 0) { if (perm.has(p, "shopchest.buy")) { - if (shop.getShopType() == ShopType.INFINITE) { - if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) { - buy(p, shop); - } else { - e.setCancelled(false); - } - } else if (shop.getShopType() == ShopType.ADMIN) { + if (shop.getShopType() == ShopType.ADMIN) { buy(p, shop); } else { if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) { @@ -196,17 +190,7 @@ public class InteractShop implements Listener { if (shop.getSellPrice() > 0) { if (perm.has(p, "shopchest.sell")) { - if (shop.getShopType() == ShopType.INFINITE) { - if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) { - if (Utils.getAmount(p.getInventory(), shop.getProduct().getType(), shop.getProduct().getDurability(), shop.getProduct().getItemMeta()) >= shop.getProduct().getAmount()) { - sell(p, shop); - } else { - p.sendMessage(Config.not_enough_items()); - } - } else { - e.setCancelled(false); - } - } else if (shop.getShopType() == ShopType.ADMIN) { + if (shop.getShopType() == ShopType.ADMIN) { if (Utils.getAmount(p.getInventory(), shop.getProduct().getType(), shop.getProduct().getDurability(), shop.getProduct().getItemMeta()) >= shop.getProduct().getAmount()) { sell(p, shop); } else { @@ -287,7 +271,6 @@ public class InteractShop implements Listener { String stock = Config.shopInfo_stock(amount); if (shop.getShopType() == ShopType.NORMAL) shopType = Config.shopInfo_isNormal(); - else if (shop.getShopType() == ShopType.INFINITE) shopType = Config.shopInfo_isInfinite(); else shopType = Config.shopInfo_isAdmin(); Map enchantmentMap; @@ -543,54 +526,6 @@ public class InteractShop implements Listener { executor.sendMessage(Config.chest_not_enough_inventory_space()); } - } else if (shop.getShopType() == ShopType.INFINITE) { - - if (econ.getBalance(shop.getVendor()) >= shop.getSellPrice()) { - EconomyResponse r = econ.depositPlayer(executor, shop.getSellPrice()); - EconomyResponse r2 = econ.withdrawPlayer(shop.getVendor(), shop.getSellPrice()); - - if (r.transactionSuccess()) { - if (r2.transactionSuccess()) { - for (int i = leftAmount; i > 0; i--) { - ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); - soldProduct.setItemMeta(product.clone().getItemMeta()); - if (Utils.getVersion(Bukkit.getServer()).contains("1_9")) { - if (executor.getInventory().getItem(40) != null) { - ItemStack is = executor.getInventory().getItem(40); - if (is.getType().equals(shop.getProduct().getType()) && is.getDurability() == shop.getProduct().getDurability() && is.getData().equals(shop.getProduct().getData()) && is.getItemMeta().equals(shop.getProduct().getItemMeta())) { - ItemStack isNew = new ItemStack(is); - int amount = is.getAmount(); - isNew.setAmount(amount - 1); - - if (amount <= 1) { - executor.getInventory().setItem(40, null); - } else { - executor.getInventory().setItem(40, isNew); - } - - } - } else { - executor.getInventory().removeItem(soldProduct); - } - } else { - executor.getInventory().removeItem(soldProduct); - } - executor.updateInventory(); - } - executor.sendMessage(Config.sell_success(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice(), shop.getVendor().getName())); - if (shop.getVendor().isOnline()) - shop.getVendor().getPlayer().sendMessage(Config.someone_sold(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice(), executor.getName())); - } else { - executor.sendMessage(Config.error_occurred(r2.errorMessage)); - } - } else { - executor.sendMessage(Config.error_occurred(r.errorMessage)); - } - } else { - executor.sendMessage(Config.vendor_not_enough_money()); - } - - } else if (shop.getShopType() == ShopType.ADMIN) { EconomyResponse r = econ.depositPlayer(executor, shop.getSellPrice()); diff --git a/src/de/epiceric/shopchest/shop/Shop.java b/src/de/epiceric/shopchest/shop/Shop.java index 1df89b9..d71cbfe 100644 --- a/src/de/epiceric/shopchest/shop/Shop.java +++ b/src/de/epiceric/shopchest/shop/Shop.java @@ -207,7 +207,6 @@ public class Shop { public enum ShopType { NORMAL, - INFINITE, ADMIN; } diff --git a/src/de/epiceric/shopchest/sql/Database.java b/src/de/epiceric/shopchest/sql/Database.java index 8c0b244..60ecff7 100644 --- a/src/de/epiceric/shopchest/sql/Database.java +++ b/src/de/epiceric/shopchest/sql/Database.java @@ -62,38 +62,6 @@ public abstract class Database { } } - public void renameColumnInfiniteToShopType() { - Connection conn = null; - Statement s = null; - try { - conn = getSQLConnection(); - s = conn.createStatement(); - s.execute("ALTER TABLE " + table + " RENAME TO " + table + "_old"); - s.close(); - s.execute(SQLiteCreateTokensTable); - s.close(); - s.execute("INSERT INTO " + table + "(id, vendor, product, world, x, y, z, buyprice, sellprice, shoptype) SELECT id, vendor, product, world, x, y, z, buyprice, sellprice, infinite FROM " + table + "_old"); - s.close(); - conn.close(); - - conn = getSQLConnection(); - s = conn.createStatement(); - s.execute("DROP TABLE " + table + "_old"); - s.close(); - } catch (SQLException ex) { - plugin.getLogger().log(Level.SEVERE, Errors.sqlConnectionExecute(), ex); - } finally { - try { - if (s != null) - s.close(); - if (conn != null) - conn.close(); - } catch (SQLException ex) { - plugin.getLogger().log(Level.SEVERE, Errors.sqlConnectionClose(), ex); - } - } - } - public int getNextFreeID() { for (int i = 1; i < getHighestID() + 1; i++) { if (getProduct(i) == null) { @@ -442,22 +410,10 @@ public abstract class Database { rs = ps.executeQuery(); while (rs.next()) { if (rs.getInt("id") == id) { - if (rs.getString("shoptype").equals("0") || rs.getString("shoptype").equals("1")) { - ps = conn.prepareStatement("UPDATE " + table + " SET shoptype = REPLACE(shoptype, '0', 'NORMAL')"); - ps.executeUpdate(); - ps.close(); - ps = conn.prepareStatement("UPDATE " + table + " SET shoptype = REPLACE(shoptype, '1', 'INFINITE')"); - ps.executeUpdate(); - return getShopType(id); - } return ShopType.valueOf(rs.getString("shoptype")); } } } catch (SQLException ex) { - if (ex.getMessage().equals("no such column: 'shoptype'")) { - renameColumnInfiniteToShopType(); - return getShopType(id); - } plugin.getLogger().log(Level.SEVERE, Errors.sqlConnectionExecute(), ex); } finally { try {