Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

Added NOCUSTOMDATA to item-paywall= and the sell='s

Browse Source
This commit is contained in:
TinyTank800 2023-04-07 11:25:39 -07:00
parent a0760da81a
commit 55dd00656f
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/me/rockyhawk/commandpanels/commandtags/CommandTags.java
View File

@ -208,6 +208,7 @@ public class CommandTags {
try { try {
byte id = -1; byte id = -1;
int customData = 0; int customData = 0;
boolean noCustom = false;
for(String val : args) { for(String val : args) {
if(val.startsWith("id:")) { if(val.startsWith("id:")) {
id = Byte.parseByte(val.substring(3)); id = Byte.parseByte(val.substring(3));
@ -216,6 +217,9 @@ public class CommandTags {
if(val.startsWith("custom-data:")) { if(val.startsWith("custom-data:")) {
customData = Integer.parseInt(val.substring(12)); customData = Integer.parseInt(val.substring(12));
} }
if(val.contains("NOCUSTOMDATA")) {
noCustom = true;
}
} }
//create the item to be removed //create the item to be removed
@ -237,9 +241,11 @@ public class CommandTags {
continue; continue;
} }
ItemStack itm = cont.get(f);
if (Material.matchMaterial(args[1]) == null) { if (Material.matchMaterial(args[1]) == null) {
//item-paywall is a custom item as it is not a material //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); ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount(), (short) f);
remainingAmount -= add.getAmount(); remainingAmount -= add.getAmount();
remCont.add(add); remCont.add(add);
@ -256,18 +262,18 @@ public class CommandTags {
String mmoType = customItemMaterial.split("\\s")[1]; String mmoType = customItemMaterial.split("\\s")[1];
String mmoID = customItemMaterial.split("\\s")[2]; 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)) { 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(); p.updateInventory();
} else { } 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]))); plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0])));
} }
removedItem = PaywallOutput.Passed; removedItem = PaywallOutput.Passed;
break; 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); ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount(), (short) f);
remainingAmount -= add.getAmount(); remainingAmount -= add.getAmount();
remCont.add(add); remCont.add(add);
@ -283,24 +289,31 @@ public class CommandTags {
} else { } else {
//if the item is a standard material //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. //Checking for custom model data. If it does not have or not the correct number go to next in loop.
if(customData != 0){ if(customData != 0){
if(!cont.get(f).hasItemMeta()){ if(!itm.hasItemMeta()){
continue; continue;
} }
if(Objects.requireNonNull(cont.get(f).getItemMeta()).getCustomModelData() != customData){ if(Objects.requireNonNull(itm.getItemMeta()).getCustomModelData() != customData){
continue; continue;
} }
} }
//Check if the item matches the id set. If not continue to next in loop. //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; 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. //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(); remainingAmount -= add.getAmount();
remCont.add(add); remCont.add(add);
if (remainingAmount <= 0) { if (remainingAmount <= 0) {

14
src/me/rockyhawk/commandpanels/commandtags/tags/economy/SellItemTags.java
View File

@ -101,6 +101,7 @@ public class SellItemTags implements Listener {
byte id = -1; byte id = -1;
String potion = "false"; String potion = "false";
int customData = 0; int customData = 0;
boolean noCustom = false;
for(String argsTemp : args){ for(String argsTemp : args){
if(argsTemp.startsWith("potion:")){ if(argsTemp.startsWith("potion:")){
potion = argsTemp.replace("potion:",""); potion = argsTemp.replace("potion:","");
@ -111,6 +112,9 @@ public class SellItemTags implements Listener {
if (argsTemp.startsWith("custom-data:")) { if (argsTemp.startsWith("custom-data:")) {
customData = Integer.parseInt(argsTemp.replace("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) //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; return 0;
} }
} }
if (id != -1) { //Check if the item matches the id set. If not continue to next in loop.
if (itm.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 && cont.get(f).hasItemMeta()){
if(Objects.requireNonNull(cont.get(f).getItemMeta()).hasCustomModelData()){
continue; 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 (customData != 0) {
if (!itm.hasItemMeta()) { if (!itm.hasItemMeta()) {
continue; continue;