Sell command tag rework.

This commit is contained in:
TinyTank800 2024-04-10 15:54:58 -07:00
parent 3e9c40c160
commit ae207f0dc8

View File

@ -3,7 +3,6 @@ package me.rockyhawk.commandpanels.commandtags.tags.economy;
import me.realized.tokenmanager.api.TokenManager; import me.realized.tokenmanager.api.TokenManager;
import me.rockyhawk.commandpanels.CommandPanels; import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.commandtags.CommandTagEvent; import me.rockyhawk.commandpanels.commandtags.CommandTagEvent;
import me.rockyhawk.commandpanels.ioclasses.legacy.MinecraftVersions;
import me.rockyhawk.commandpanels.openpanelsmanager.PanelPosition; import me.rockyhawk.commandpanels.openpanelsmanager.PanelPosition;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -12,12 +11,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
public class SellItemTags implements Listener { public class SellItemTags implements Listener {
CommandPanels plugin; CommandPanels plugin;
@ -29,15 +24,15 @@ public class SellItemTags implements Listener {
public void commandTag(CommandTagEvent e){ public void commandTag(CommandTagEvent e){
if(e.name.equalsIgnoreCase("sell=")){ if(e.name.equalsIgnoreCase("sell=")){
e.commandTagUsed(); e.commandTagUsed();
//if player uses sell= it will be eg. sell= <total cashback> <item> <amount of item> [enchanted:KNOCKBACK:1] [potion:JUMP] [custom-data:#] //if player uses sell= it will be eg. sell= <total cashback> <item> <amount of item> [IGNORENBT]
try { try {
if (plugin.econ != null) { if (plugin.econ != null) {
int sold = removeItem(e.p, e.args, false); int sold = removeItem(e.p, e, false);
if (sold <= 0) { if (sold <= 0) {
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure"))); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure")));
} else { } else {
plugin.econ.depositPlayer(e.p, Double.parseDouble(e.args[0])); plugin.econ.depositPlayer(e.p, Double.parseDouble(e.args[0]));
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", e.args[1]).replaceAll("%cp-args2%", "$" + e.args[0])); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", sold + " " + e.args[1]).replaceAll("%cp-args2%", "$" + e.args[0]));
} }
} else { } else {
plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires Vault and an Economy to work!"); plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires Vault and an Economy to work!");
@ -50,15 +45,15 @@ public class SellItemTags implements Listener {
} }
if(e.name.equalsIgnoreCase("sellall=")){ if(e.name.equalsIgnoreCase("sellall=")){
e.commandTagUsed(); e.commandTagUsed();
//if player uses sell-all= it will be eg. sell-all= <Per Item Cashback> <item> [enchanted:KNOCKBACK:1] [potion:JUMP] //if player uses sell-all= it will be eg. sell-all= <Per Item Cashback> <item> [IGNORENBT]
try { try {
if (plugin.econ != null) { if (plugin.econ != null) {
int sold = removeItem(e.p, e.args, true); int sold = removeItem(e.p, e, true);
if (sold <= 0) { if (sold <= 0) {
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure"))); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure")));
} else { } else {
plugin.econ.depositPlayer(e.p, Double.parseDouble(e.args[0]) * sold); plugin.econ.depositPlayer(e.p, Double.parseDouble(e.args[0]) * sold);
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", e.args[1]).replaceAll("%cp-args2%", "$" + Double.parseDouble(e.args[0]) * sold)); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", sold + " " + e.args[1]).replaceAll("%cp-args2%", String.valueOf(Double.parseDouble(e.args[0]) * sold)));
} }
} else { } else {
plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires Vault and an Economy to work!"); plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires Vault and an Economy to work!");
@ -71,17 +66,17 @@ public class SellItemTags implements Listener {
} }
if(e.name.equalsIgnoreCase("tokensell=")) { if(e.name.equalsIgnoreCase("tokensell=")) {
e.commandTagUsed(); e.commandTagUsed();
//if player uses tokensell= it will be eg. tokensell= <cashback> <item> <amount of item> [enchanted:KNOCKBACK:1] [potion:JUMP] //if player uses tokensell= it will be eg. tokensell= <cashback> <item> <amount of item> [IGNORENBT]
try { try {
if (plugin.getServer().getPluginManager().isPluginEnabled("TokenManager")) { if (plugin.getServer().getPluginManager().isPluginEnabled("TokenManager")) {
final TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager"); final TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
int sold = removeItem(e.p, e.args, false); int sold = removeItem(e.p, e, false);
if (sold <= 0) { if (sold <= 0) {
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure"))); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure")));
} else { } else {
assert api != null; assert api != null;
api.addTokens(e.p, Long.parseLong(e.args[0])); api.addTokens(e.p, Long.parseLong(e.args[0]));
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", e.args[1])); plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", sold + " " + e.args[1]));
} }
} else { } else {
plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires TokenManager to work!"); plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires TokenManager to work!");
@ -91,115 +86,194 @@ public class SellItemTags implements Listener {
plugin.tex.sendMessage(e.p, plugin.config.getString("config.format.error") + " " + "commands: " + e.name); plugin.tex.sendMessage(e.p, plugin.config.getString("config.format.error") + " " + "commands: " + e.name);
} }
} }
if(e.name.equalsIgnoreCase("tokensellall=")){
e.commandTagUsed();
//if player uses tokensellall= it will be eg. tokensellall= <cashback> <item> [IGNORENBT]
try {
if (plugin.getServer().getPluginManager().isPluginEnabled("TokenManager")) {
final TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
int sold = removeItem(e.p, e, true);
if (sold <= 0) {
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.failure")));
} else {
assert api != null;
api.addTokens(e.p, Long.parseLong(e.args[0]));
plugin.tex.sendString(e.panel, PanelPosition.Top, e.p, Objects.requireNonNull(plugin.config.getString("purchase.item.success")).replaceAll("%cp-args%", sold + " " + e.args[1]));
}
} else {
plugin.tex.sendMessage(e.p, ChatColor.RED + "Selling Requires TokenManager to work!");
}
} catch (Exception sell) {
plugin.debug(sell,e.p);
plugin.tex.sendMessage(e.p, plugin.config.getString("config.format.error") + " " + "commands: " + e.name);
}
return;
}
} }
//returns false if player does not have item //returns false if player does not have item
private int removeItem(Player p, String[] args, boolean removeAll){ private int removeItem(Player p, CommandTagEvent e, boolean removeAll){
String[] args = e.args;
//get inventory slots and then an empty list to store slots that have the item to sell //get inventory slots and then an empty list to store slots that have the item to sell
List<ItemStack> cont = new ArrayList<>(Arrays.asList(plugin.inventorySaver.getNormalInventory(p))); List<ItemStack> cont = new ArrayList<>(Arrays.asList(plugin.inventorySaver.getNormalInventory(p)));
List<ItemStack> remCont = new ArrayList<>(); HashMap<Integer, ItemStack> remCont = new HashMap<>();
byte id = -1; int count = 0;
String potion = "false";
int customData = 0;
boolean noCustom = false;
for(String argsTemp : args){
if(argsTemp.startsWith("potion:")){
potion = argsTemp.replace("potion:","");
}
if (argsTemp.startsWith("id:")) {
id = Byte.parseByte(argsTemp.replace("id:", ""));
}
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) try {
ItemStack sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(args[1])), removeAll ? 0 : Integer.parseInt(args[2])); int id = -1;
int remainingAmount = removeAll ? 0 : sellItem.getAmount(); for (String val : args) {
for (int f = 0; f < 36; f++) { if (val.startsWith("id:")) {
ItemStack itm = cont.get(f); id = Integer.parseInt(val.substring(3));
ItemStack remItm; }
if (itm != null && itm.getType().equals(sellItem.getType())) { }
remItm = new ItemStack(itm.getType(), itm.getAmount(), (short)f);
//check to ensure any extensions are checked ItemStack sellItem;
try { if (Material.matchMaterial(args[1]) == null) {
if (!potion.equals("false")) { sellItem = plugin.itemCreate.makeCustomItemFromConfig(e.panel, PanelPosition.Top, e.panel.getConfig().getConfigurationSection("custom-item." + args[1]), e.p, true, true, false);
PotionMeta potionMeta = (PotionMeta) itm.getItemMeta(); if(!removeAll){
assert potionMeta != null; sellItem.setAmount(Integer.parseInt(args[2]));
if (!potionMeta.getBasePotionData().getType().name().equalsIgnoreCase(potion)) { } else {
p.sendMessage(plugin.tex.colour( plugin.tag + ChatColor.RED + "Your item has the wrong potion effect")); sellItem.setAmount(1);
return 0; }
}
} } else {
//Check if the item matches the id set. If not continue to next in loop. if(!removeAll){
if(id != -1 && itm.getDurability() != id){ sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(args[1])), Integer.parseInt(args[2]));
continue; } else {
} sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(args[1])));
//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; //This is here for when people want to take nbt items like spawners with types in a check for spawners.
} boolean ignoreNBT = false;
} for(String arg : args){
//Check if custom model data is set and if the item has that data. If not continue to next in loop. if (arg.equalsIgnoreCase("IGNORENBT")) {
if (customData != 0) { ignoreNBT = true;
if (!itm.hasItemMeta()) { break;
continue; }
} else { }
if(Objects.requireNonNull(itm.getItemMeta()).getCustomModelData() != customData){
continue; int remainingAmount = removeAll ? 0 : sellItem.getAmount();
//loop through items in the inventory
for (int f = 0; f < 36; f++) {
if (cont.get(f) == null) {
//skip slot if empty
continue;
}
ItemStack itm = cont.get(f);
if (Material.matchMaterial(args[1]) == null) {
//if custom item is a mmo item (1.14+ for the API)
try {
if (plugin.getServer().getPluginManager().isPluginEnabled("MMOItems") && e.panel.getConfig().getString("custom-item." + args[1] + ".material").startsWith("mmo=")) {
String customItemMaterial = e.panel.getConfig().getString("custom-item." + args[1] + ".material");
String mmoType = customItemMaterial.split("\\s")[1];
String mmoID = customItemMaterial.split("\\s")[2];
if (plugin.isMMOItem(itm, mmoType, mmoID)) {
ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount());
remainingAmount -= add.getAmount();
remCont.put(f,add);
if (remainingAmount <= 0 && !removeAll) {
break;
}
} }
continue; //This stops the other custom item section from reading and adding false numbers.
}
} catch (Exception ex) {
plugin.debug(ex, p);
}
//item-paywall is a custom item as it is not a material
if (plugin.itemCreate.isIdentical(sellItem, itm, Objects.requireNonNull(e.panel.getConfig().getConfigurationSection("custom-item." + args[1])).contains("nbt"))) {
ItemStack add = new ItemStack(p.getInventory().getItem(f).getType(), p.getInventory().getItem(f).getAmount());
remainingAmount -= add.getAmount();
remCont.put(f,add);
if (remainingAmount <= 0 && !removeAll) {
break;
} }
} }
}catch(Exception exc){
//skip if it cannot do unless plugin.debug is enabled
plugin.debug(exc,p);
}
remCont.add(remItm);
//if the remaining amount has been reached, break otherwise sell all
if (!removeAll) {
remainingAmount -= remItm.getAmount();
if (remainingAmount <= 0) {
break;
}
} else { } else {
sellItem.setAmount(sellItem.getAmount() + remItm.getAmount()); //if the item is a standard material
if (itm.getType() == sellItem.getType()) {
//If item has custom meta continue to next item.
if(itm.hasItemMeta() && !ignoreNBT){
continue;
}
//Check if the item matches the id set. If not continue to next in loop.
if (id != -1 && itm.getDurability() != id) {
continue;
}
//Adding item to the remove list then checking if we have reached the required amount.
ItemStack add = new ItemStack(itm.getType(), itm.getAmount());
remainingAmount -= add.getAmount();
remCont.put(f,add);
if (remainingAmount <= 0 && !removeAll) {
break;
}
}
} }
} }
}
if(remainingAmount <= 0){ if (remainingAmount <= 0 && !removeAll) {
int removedItems = 0; //Only remove if passed requirement
for (int f = 0; f <= remCont.size() - 1; f++) { for(Map.Entry<Integer, ItemStack> entry : remCont.entrySet()) {
ItemStack remItm = remCont.get(f); ItemStack remItem = entry.getValue();
if(f == remCont.size() - 1){
if(plugin.inventorySaver.hasNormalInventory(p)){ //Check if its the last item in the loop and only subtract the remaining amount.
p.getInventory().getItem(remItm.getDurability()).setAmount(remItm.getAmount() - sellItem.getAmount()); if (sellItem.getAmount() < remItem.getAmount()) {
p.updateInventory(); if (plugin.inventorySaver.hasNormalInventory(p)) {
}else{ p.getInventory().getItem(entry.getKey()).setAmount(remItem.getAmount() - sellItem.getAmount());
cont.get(remItm.getDurability()).setAmount(remItm.getAmount() - sellItem.getAmount()); count += remItem.getAmount();
plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0]))); p.updateInventory();
} else {
cont.get(entry.getKey()).setAmount(remItem.getAmount() - sellItem.getAmount());
count += remItem.getAmount();
plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0])));
}
} else { //If its anywhere but the last in loop just get rid of the items.
if (plugin.inventorySaver.hasNormalInventory(p)) {
p.getInventory().setItem(entry.getKey(), null);
count += remItem.getAmount();
p.updateInventory();
} else {
cont.remove(entry.getValue());
count += remItem.getAmount();
plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0])));
}
} }
} else {
if(plugin.inventorySaver.hasNormalInventory(p)){ sellItem.setAmount(sellItem.getAmount() - remItem.getAmount());
p.getInventory().getItem(remItm.getDurability()).setAmount(0); }
} else if(remainingAmount <= 0){
//Remove all. Used for sellall=
for(Map.Entry<Integer, ItemStack> entry : remCont.entrySet()) {
ItemStack remItem = entry.getValue();
if (plugin.inventorySaver.hasNormalInventory(p)) {
p.getInventory().setItem(entry.getKey(), null);
count += remItem.getAmount();
p.updateInventory(); p.updateInventory();
}else{ } else {
cont.get(remItm.getDurability()).setAmount(0); cont.remove(entry.getValue());
count += remItem.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])));
} }
} }
removedItems += remItm.getAmount();
sellItem.setAmount(sellItem.getAmount() - remItm.getAmount());
} }
return removedItems;
//Return how many were sold.
return count;
} catch (Exception buyc) {
//Error somewhere in sell= process.
plugin.debug(buyc, p);
plugin.tex.sendString(p, plugin.tag + plugin.config.getString("config.format.error") + " " + "commands: sell=/sellall=");
return 0; //Return 0 showing failure.
} }
return 0;
} }
} }