From 55dd00656fbbc5e40f917ab8018d17c7697457de Mon Sep 17 00:00:00 2001 From: TinyTank800 Date: Fri, 7 Apr 2023 11:25:39 -0700 Subject: [PATCH] Added NOCUSTOMDATA to item-paywall= and the sell='s --- .../commandtags/CommandTags.java | 33 +++++++++++++------ .../tags/economy/SellItemTags.java | 14 ++++++-- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java index bfc54bd..276e297 100644 --- a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java +++ b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java @@ -208,6 +208,7 @@ public class CommandTags { try { byte id = -1; int customData = 0; + boolean noCustom = false; for(String val : args) { if(val.startsWith("id:")) { id = Byte.parseByte(val.substring(3)); @@ -216,6 +217,9 @@ public class CommandTags { if(val.startsWith("custom-data:")) { customData = Integer.parseInt(val.substring(12)); } + if(val.contains("NOCUSTOMDATA")) { + noCustom = true; + } } //create the item to be removed @@ -237,9 +241,11 @@ public class CommandTags { continue; } + ItemStack itm = cont.get(f); + if (Material.matchMaterial(args[1]) == null) { //item-paywall is a custom item as it is not a material - if (plugin.itemCreate.isIdentical(sellItem, cont.get(f))) { + if (plugin.itemCreate.isIdentical(sellItem, itm)) { ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount(), (short) f); remainingAmount -= add.getAmount(); remCont.add(add); @@ -256,18 +262,18 @@ public class CommandTags { String mmoType = customItemMaterial.split("\\s")[1]; String mmoID = customItemMaterial.split("\\s")[2]; - if (plugin.isMMOItem(cont.get(f), mmoType, mmoID) && sellItem.getAmount() <= cont.get(f).getAmount()) { + if (plugin.isMMOItem(itm, mmoType, mmoID) && sellItem.getAmount() <= itm.getAmount()) { if (plugin.inventorySaver.hasNormalInventory(p)) { - p.getInventory().getItem(f).setAmount(cont.get(f).getAmount() - sellItem.getAmount()); + p.getInventory().getItem(f).setAmount(itm.getAmount() - sellItem.getAmount()); p.updateInventory(); } else { - cont.get(f).setAmount(cont.get(f).getAmount() - sellItem.getAmount()); + itm.setAmount(itm.getAmount() - sellItem.getAmount()); plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0]))); } removedItem = PaywallOutput.Passed; break; } - if (plugin.isMMOItem(cont.get(f), mmoType, mmoID)) { + if (plugin.isMMOItem(itm, mmoType, mmoID)) { ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount(), (short) f); remainingAmount -= add.getAmount(); remCont.add(add); @@ -283,24 +289,31 @@ public class CommandTags { } else { //if the item is a standard material - if (cont.get(f).getType() == sellItem.getType()) { + if (itm.getType() == sellItem.getType()) { //Checking for custom model data. If it does not have or not the correct number go to next in loop. if(customData != 0){ - if(!cont.get(f).hasItemMeta()){ + if(!itm.hasItemMeta()){ continue; } - if(Objects.requireNonNull(cont.get(f).getItemMeta()).getCustomModelData() != customData){ + if(Objects.requireNonNull(itm.getItemMeta()).getCustomModelData() != customData){ continue; } } //Check if the item matches the id set. If not continue to next in loop. - if(id != -1 && cont.get(f).getDurability() != id){ + if(id != -1 && itm.getDurability() != id){ continue; } + //Check if noCustom is set and if the item has custom data. If so continue to next in loop. + if(noCustom && itm.hasItemMeta()){ + if(Objects.requireNonNull(itm.getItemMeta()).hasCustomModelData()){ + continue; + } + } + //Adding item to the remove list then checking if we have reached the required amount. - ItemStack add = new ItemStack(cont.get(f).getType(), cont.get(f).getAmount(), (short) f); + ItemStack add = new ItemStack(itm.getType(), itm.getAmount(), (short) f); remainingAmount -= add.getAmount(); remCont.add(add); if (remainingAmount <= 0) { diff --git a/src/me/rockyhawk/commandpanels/commandtags/tags/economy/SellItemTags.java b/src/me/rockyhawk/commandpanels/commandtags/tags/economy/SellItemTags.java index 5b9426a..8b2b2d7 100644 --- a/src/me/rockyhawk/commandpanels/commandtags/tags/economy/SellItemTags.java +++ b/src/me/rockyhawk/commandpanels/commandtags/tags/economy/SellItemTags.java @@ -101,6 +101,7 @@ public class SellItemTags implements Listener { byte id = -1; String potion = "false"; int customData = 0; + boolean noCustom = false; for(String argsTemp : args){ if(argsTemp.startsWith("potion:")){ potion = argsTemp.replace("potion:",""); @@ -111,6 +112,9 @@ public class SellItemTags implements Listener { if (argsTemp.startsWith("custom-data:")) { customData = Integer.parseInt(argsTemp.replace("custom-data:", "")); } + if (argsTemp.contains("NOCUSTOMDATA")) { + noCustom = true; + } } //create an itemstack of the item to sell and the amount to sell (0 if all as args[2] will not be an amount) @@ -131,11 +135,17 @@ public class SellItemTags implements Listener { return 0; } } - if (id != -1) { - if (itm.getDurability() != id) { + //Check if the item matches the id set. If not continue to next in loop. + if(id != -1 && itm.getDurability() != id){ + continue; + } + //Check if noCustom is set and if the item has custom data. If so continue to next in loop. + if(noCustom && cont.get(f).hasItemMeta()){ + if(Objects.requireNonNull(cont.get(f).getItemMeta()).hasCustomModelData()){ continue; } } + //Check if custom model data is set and if the item has that data. If not continue to next in loop. if (customData != 0) { if (!itm.hasItemMeta()) { continue;