From b729485157a135988755d574d884d8a1c2db9716 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 27 Nov 2016 22:38:33 +0100 Subject: [PATCH] Removed Deprecated Backpacks --- .../Slimefun/Lists/SlimefunItems.java | 8 --- .../Slimefun/listeners/BackpackListener.java | 57 ------------------- .../Slimefun/listeners/ToolListener.java | 8 --- 3 files changed, 73 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java index fb8308165..3faf99deb 100644 --- a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java +++ b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java @@ -60,14 +60,6 @@ public class SlimefunItems { public static ItemStack VOIDBAG_BIG = null; public static ItemStack VOIDBAG_LARGE = null; public static ItemStack BOUND_VOIDBAG = null; - - public static ItemStack DEPRECATED_BACKPACK_SMALL = new CustomItem(Material.CHEST, "&eSmall Backpack", 0, new String[] {"", "&7Size: &e9", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_BACKPACK_MEDIUM = new CustomItem(Material.CHEST, "&eBackpack", 0, new String[] {"", "&7Size: &e18", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_BACKPACK_LARGE = new CustomItem(Material.CHEST, "&eLarge Backpack", 0, new String[] {"", "&7Size: &e27", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_WOVEN_BACKPACK = new CustomItem(Material.CHEST, "&eWoven Backpack", 0, new String[] {"", "&7Size: &e36", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_GILDED_BACKPACK = new CustomItem(Material.CHEST, "&eGilded Backpack", 0, new String[] {"", "&7Size: &e45", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_BOUND_BACKPACK = new CustomItem(Material.ENDER_CHEST, "&cSoulbound Backpack", 0, new String[] {"", "&7Size: &e36", "&7ID: ", "", "&7&eRight Click&7 to open"}); - public static ItemStack DEPRECATED_COOLER = new CustomItem(Material.CHEST, "&bCooler", 0, new String[] {"&rAllows you to store Juices/Smoothies", "&rand automatically consumes them when you are hungry", "&rand you have this in your Inventory", "", "&7Size: &e27", "&7ID: ", "", "&7&eRight Click&7 to open"}); /* Jetpacks */ public static ItemStack DURALUMIN_JETPACK = new CustomArmor(new CustomItem(new MaterialData(Material.LEATHER_CHESTPLATE), "&9Electric Jetpack &7- &eI", "", "&8\u21E8 &7Material: &bDuralumin", "&c&o&8\u21E8 &e\u26A1 &70 / 20 J", "&8\u21E8 &7Thrust: &c0.35", "", "&7Hold &eShift&7 to use"), Color.SILVER); diff --git a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java index 7cf1a08a0..b245b9ad8 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java @@ -70,63 +70,6 @@ public class BackpackListener implements Listener { if (e.getAction() == Action.RIGHT_CLICK_AIR || e.getAction() == Action.RIGHT_CLICK_BLOCK) { ItemStack item = e.getPlayer().getInventory().getItemInMainHand(); Player p = e.getPlayer(); - if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_SMALL, false)) { - ItemStack stack = SlimefunItems.BACKPACK_SMALL.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_MEDIUM, false)) { - ItemStack stack = SlimefunItems.BACKPACK_MEDIUM.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_LARGE, false)) { - ItemStack stack = SlimefunItems.BACKPACK_LARGE.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_WOVEN_BACKPACK, false)) { - ItemStack stack = SlimefunItems.WOVEN_BACKPACK.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_GILDED_BACKPACK, false)) { - ItemStack stack = SlimefunItems.GILDED_BACKPACK.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BOUND_BACKPACK, false)) { - ItemStack stack = SlimefunItems.BOUND_BACKPACK.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_COOLER, false)) { - ItemStack stack = SlimefunItems.COOLER.clone(); - ItemMeta im = stack.getItemMeta(); - im.setLore(item.getItemMeta().getLore()); - stack.setItemMeta(im); - p.getInventory().setItemInMainHand(stack); - e.setCancelled(true); - } - if (SlimefunManager.isItemSimiliar(item, SlimefunItems.BACKPACK_SMALL, false)) { e.setCancelled(true); if (Slimefun.hasUnlocked(p, SlimefunItems.BACKPACK_SMALL, true)) { diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java index e7a928970..f533fbb73 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java @@ -85,14 +85,6 @@ public class ToolListener implements Listener { else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.BOUND_BACKPACK, false)) e.setCancelled(true); else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.COOLER, false)) e.setCancelled(true); else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.ENDER_BACKPACK, false)) e.setCancelled(true); - - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_SMALL, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_MEDIUM, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BACKPACK_LARGE, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_WOVEN_BACKPACK, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_GILDED_BACKPACK, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_BOUND_BACKPACK, false)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.DEPRECATED_COOLER, false)) e.setCancelled(true); else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.CARBON, false)) e.setCancelled(true); else if (SlimefunManager.isItemSimiliar(item, SlimefunItems.COMPRESSED_CARBON, false)) e.setCancelled(true);