mirror of
https://github.com/EpicEricEE/ShopChest.git
synced 2024-09-29 07:37:48 +02:00
Improved and simplified buy and sell methods
Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
This commit is contained in:
Eric
parent
654fa260f4
commit
0015adefb5
@ -25,6 +25,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
|
|||||||
import org.bukkit.event.player.PlayerMoveEvent;
|
import org.bukkit.event.player.PlayerMoveEvent;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.PlayerInventory;
|
||||||
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
|
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
|
||||||
import org.yi.acru.bukkit.Lockette.Lockette;
|
import org.yi.acru.bukkit.Lockette.Lockette;
|
||||||
|
|
||||||
@ -160,7 +161,7 @@ public class InteractShop implements Listener {
|
|||||||
} else {
|
} else {
|
||||||
if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
|
if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
|
||||||
Chest c = (Chest) b.getState();
|
Chest c = (Chest) b.getState();
|
||||||
if (Utils.getAmount(c.getInventory(), shop.getProduct().clone().getType(), shop.getProduct().clone().getDurability(), shop.getProduct().getItemMeta()) >= shop.getProduct().getAmount()) {
|
if (Utils.getAmount(c.getInventory(), shop.getProduct()) >= shop.getProduct().getAmount()) {
|
||||||
buy(p, shop);
|
buy(p, shop);
|
||||||
} else {
|
} else {
|
||||||
p.sendMessage(Config.out_of_stock());
|
p.sendMessage(Config.out_of_stock());
|
||||||
@ -190,15 +191,8 @@ public class InteractShop implements Listener {
|
|||||||
|
|
||||||
if (shop.getSellPrice() > 0) {
|
if (shop.getSellPrice() > 0) {
|
||||||
if (perm.has(p, "shopchest.sell")) {
|
if (perm.has(p, "shopchest.sell")) {
|
||||||
if (shop.getShopType() == ShopType.ADMIN) {
|
if ((shop.getShopType() == ShopType.ADMIN) || (!shop.getVendor().getUniqueId().equals(p.getUniqueId()))) {
|
||||||
if (Utils.getAmount(p.getInventory(), shop.getProduct().getType(), shop.getProduct().getDurability(), shop.getProduct().getItemMeta()) >= shop.getProduct().getAmount()) {
|
if (Utils.getAmount(p.getInventory(), shop.getProduct()) >= shop.getProduct().getAmount()) {
|
||||||
sell(p, shop);
|
|
||||||
} else {
|
|
||||||
p.sendMessage(Config.not_enough_items());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
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);
|
sell(p, shop);
|
||||||
} else {
|
} else {
|
||||||
p.sendMessage(Config.not_enough_items());
|
p.sendMessage(Config.not_enough_items());
|
||||||
@ -206,8 +200,6 @@ public class InteractShop implements Listener {
|
|||||||
} else {
|
} else {
|
||||||
e.setCancelled(false);
|
e.setCancelled(false);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
p.sendMessage(Config.noPermission_sell());
|
p.sendMessage(Config.noPermission_sell());
|
||||||
}
|
}
|
||||||
@ -260,7 +252,7 @@ public class InteractShop implements Listener {
|
|||||||
|
|
||||||
Chest c = (Chest) shop.getLocation().getBlock().getState();
|
Chest c = (Chest) shop.getLocation().getBlock().getState();
|
||||||
|
|
||||||
int amount = Utils.getAmount(c.getInventory(), shop.getProduct().getType(), shop.getProduct().getDurability(), shop.getProduct().getItemMeta());
|
int amount = Utils.getAmount(c.getInventory(), shop.getProduct());
|
||||||
|
|
||||||
String vendor = Config.shopInfo_vendor(shop.getVendor().getName());
|
String vendor = Config.shopInfo_vendor(shop.getVendor().getName());
|
||||||
String product = Config.shopInfo_product(shop.getProduct().getAmount(), ItemNames.lookup(shop.getProduct()));
|
String product = Config.shopInfo_product(shop.getProduct().getAmount(), ItemNames.lookup(shop.getProduct()));
|
||||||
@ -312,34 +304,29 @@ public class InteractShop implements Listener {
|
|||||||
executor.sendMessage(price);
|
executor.sendMessage(price);
|
||||||
executor.sendMessage(shopType);
|
executor.sendMessage(shopType);
|
||||||
executor.sendMessage(" ");
|
executor.sendMessage(" ");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buy(Player executor, Shop shop) {
|
private void buy(Player executor, Shop shop) {
|
||||||
|
|
||||||
if (econ.getBalance(executor) >= shop.getBuyPrice()) {
|
if (econ.getBalance(executor) >= shop.getBuyPrice()) {
|
||||||
|
|
||||||
Block b = shop.getLocation().getBlock();
|
Block b = shop.getLocation().getBlock();
|
||||||
Chest c = (Chest) b.getState();
|
Chest c = (Chest) b.getState();
|
||||||
|
|
||||||
HashMap<Integer, Integer> slotFree = new HashMap<>();
|
HashMap<Integer, Integer> slotFree = new HashMap<>();
|
||||||
ItemStack product = shop.getProduct().clone();
|
ItemStack product = new ItemStack(shop.getProduct());
|
||||||
Inventory inventory = executor.getInventory();
|
Inventory inventory = executor.getInventory();
|
||||||
|
|
||||||
for (int i = 0; i < 36; i++) {
|
for (int i = 0; i < 36; i++) {
|
||||||
|
|
||||||
ItemStack item = inventory.getItem(i);
|
ItemStack item = inventory.getItem(i);
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
slotFree.put(i, product.getMaxStackSize());
|
slotFree.put(i, product.getMaxStackSize());
|
||||||
} else {
|
} else {
|
||||||
if ((item.getType().equals(product.getType())) && (item.getDurability() == product.getDurability()) && (item.getItemMeta().equals(product.getItemMeta())) && (item.getData().equals(product.getData()))) {
|
if (item.isSimilar(product)) {
|
||||||
int amountInSlot = item.getAmount();
|
int amountInSlot = item.getAmount();
|
||||||
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
||||||
slotFree.put(i, amountToFullStack);
|
slotFree.put(i, amountToFullStack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Utils.getVersion(Bukkit.getServer()).contains("1_9")) {
|
if (Utils.getVersion(Bukkit.getServer()).contains("1_9")) {
|
||||||
@ -347,7 +334,7 @@ public class InteractShop implements Listener {
|
|||||||
if (item == null) {
|
if (item == null) {
|
||||||
slotFree.put(40, product.getMaxStackSize());
|
slotFree.put(40, product.getMaxStackSize());
|
||||||
} else {
|
} else {
|
||||||
if ((item.getType().equals(product.getType())) && (item.getDurability() == product.getDurability()) && (item.getItemMeta().equals(product.getItemMeta())) && (item.getData().equals(product.getData()))) {
|
if (item.isSimilar(product)) {
|
||||||
int amountInSlot = item.getAmount();
|
int amountInSlot = item.getAmount();
|
||||||
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
||||||
slotFree.put(40, amountToFullStack);
|
slotFree.put(40, amountToFullStack);
|
||||||
@ -355,79 +342,35 @@ public class InteractShop implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int leftAmount = product.getAmount();
|
|
||||||
|
|
||||||
int freeAmount = 0;
|
int freeAmount = 0;
|
||||||
for (int value : slotFree.values()) {
|
for (int value : slotFree.values()) {
|
||||||
freeAmount += value;
|
freeAmount += value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (freeAmount >= leftAmount) {
|
if (freeAmount >= product.getAmount()) {
|
||||||
|
|
||||||
EconomyResponse r = econ.withdrawPlayer(executor, shop.getBuyPrice());
|
EconomyResponse r = econ.withdrawPlayer(executor, shop.getBuyPrice());
|
||||||
EconomyResponse r2 = null;
|
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), shop.getBuyPrice()) : null;
|
||||||
if (shop.getShopType() != ShopType.ADMIN) r2 = econ.depositPlayer(shop.getVendor(), shop.getBuyPrice());
|
|
||||||
|
|
||||||
if (r.transactionSuccess()) {
|
if (r.transactionSuccess()) {
|
||||||
if (r2 != null) {
|
if (r2 != null) {
|
||||||
if (r2.transactionSuccess()) {
|
if (r2.transactionSuccess()) {
|
||||||
for (int slot : slotFree.keySet()) {
|
addToInventory(inventory, product);
|
||||||
int amountInSlot = product.getMaxStackSize() - slotFree.get(slot);
|
removeFromInventory(c.getInventory(), product);
|
||||||
|
executor.updateInventory();
|
||||||
|
executor.sendMessage(Config.buy_success(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice(), shop.getVendor().getName()));
|
||||||
|
|
||||||
for (int i = amountInSlot; i < product.getMaxStackSize(); i++) {
|
if (shop.getVendor().isOnline()) {
|
||||||
if (leftAmount > 0) {
|
shop.getVendor().getPlayer().sendMessage(Config.someone_bought(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice(), executor.getName()));
|
||||||
ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
|
|
||||||
boughtProduct.setItemMeta(product.clone().getItemMeta());
|
|
||||||
if (shop.getShopType() == ShopType.NORMAL)
|
|
||||||
c.getInventory().removeItem(boughtProduct);
|
|
||||||
if (slot != 40) {
|
|
||||||
inventory.addItem(boughtProduct);
|
|
||||||
} else {
|
|
||||||
ItemStack is = new ItemStack(boughtProduct);
|
|
||||||
int amount = 0;
|
|
||||||
if (inventory.getItem(40) != null)
|
|
||||||
amount = inventory.getItem(40).getAmount();
|
|
||||||
is.setAmount(amount + 1);
|
|
||||||
inventory.setItem(40, is);
|
|
||||||
}
|
|
||||||
executor.updateInventory();
|
|
||||||
leftAmount--;
|
|
||||||
} else if (leftAmount == 0) {
|
|
||||||
executor.sendMessage(Config.buy_success(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice(), shop.getVendor().getName()));
|
|
||||||
if (shop.getVendor().isOnline())
|
|
||||||
shop.getVendor().getPlayer().sendMessage(Config.someone_bought(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice(), executor.getName()));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.error_occurred(r2.errorMessage));
|
executor.sendMessage(Config.error_occurred(r2.errorMessage));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (int slot : slotFree.keySet()) {
|
addToInventory(inventory, product);
|
||||||
int amountInSlot = product.getMaxStackSize() - slotFree.get(slot);
|
executor.updateInventory();
|
||||||
|
executor.sendMessage(Config.buy_success_admin(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice()));
|
||||||
for (int i = amountInSlot; i < product.getMaxStackSize(); i++) {
|
|
||||||
if (leftAmount > 0) {
|
|
||||||
ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
|
|
||||||
boughtProduct.setItemMeta(product.clone().getItemMeta());
|
|
||||||
if (slot != 40) {
|
|
||||||
inventory.addItem(boughtProduct);
|
|
||||||
} else {
|
|
||||||
ItemStack is = new ItemStack(boughtProduct);
|
|
||||||
int amount = 0;
|
|
||||||
if (inventory.getItem(40) != null) amount = inventory.getItem(40).getAmount();
|
|
||||||
is.setAmount(amount + 1);
|
|
||||||
inventory.setItem(40, is);
|
|
||||||
}
|
|
||||||
executor.updateInventory();
|
|
||||||
leftAmount--;
|
|
||||||
} else if (leftAmount == 0) {
|
|
||||||
executor.sendMessage(Config.buy_success_admin(product.getAmount(), ItemNames.lookup(product), shop.getBuyPrice()));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.error_occurred(r.errorMessage));
|
executor.sendMessage(Config.error_occurred(r.errorMessage));
|
||||||
@ -438,131 +381,179 @@ public class InteractShop implements Listener {
|
|||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.not_enough_money());
|
executor.sendMessage(Config.not_enough_money());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sell(Player executor, Shop shop) {
|
private void sell(Player executor, Shop shop) {
|
||||||
|
if (econ.getBalance(shop.getVendor()) >= shop.getSellPrice()) {
|
||||||
|
|
||||||
Block block = shop.getLocation().getBlock();
|
Block block = shop.getLocation().getBlock();
|
||||||
Chest chest = (Chest) block.getState();
|
Chest chest = (Chest) block.getState();
|
||||||
|
|
||||||
HashMap<Integer, Integer> slotFree = new HashMap<>();
|
HashMap<Integer, Integer> slotFree = new HashMap<>();
|
||||||
ItemStack product = shop.getProduct().clone();
|
ItemStack product = new ItemStack(shop.getProduct());
|
||||||
Inventory inventory = chest.getInventory();
|
Inventory inventory = chest.getInventory();
|
||||||
|
|
||||||
for (int i = 0; i < chest.getInventory().getSize(); i++) {
|
for (int i = 0; i < inventory.getSize(); i++) {
|
||||||
|
ItemStack item = inventory.getItem(i);
|
||||||
ItemStack item = inventory.getItem(i);
|
if (item == null) {
|
||||||
if (item == null) {
|
slotFree.put(i, product.getMaxStackSize());
|
||||||
slotFree.put(i, product.getMaxStackSize());
|
} else {
|
||||||
} else {
|
if (item.isSimilar(product)) {
|
||||||
if ((item.getType().equals(product.getType())) && (item.getDurability() == product.getDurability()) && (item.getItemMeta().equals(product.getItemMeta())) && (item.getData().equals(product.getData()))) {
|
int amountInSlot = item.getAmount();
|
||||||
int amountInSlot = item.getAmount();
|
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
||||||
int amountToFullStack = product.getMaxStackSize() - amountInSlot;
|
slotFree.put(i, amountToFullStack);
|
||||||
slotFree.put(i, amountToFullStack);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
int freeAmount = 0;
|
||||||
|
for (int value : slotFree.values()) {
|
||||||
|
freeAmount += value;
|
||||||
|
}
|
||||||
|
|
||||||
int leftAmount = product.getAmount();
|
if (freeAmount >= product.getAmount()) {
|
||||||
|
|
||||||
int freeAmount = 0;
|
EconomyResponse r = econ.withdrawPlayer(executor, shop.getBuyPrice());
|
||||||
for (int value : slotFree.values()) {
|
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), shop.getBuyPrice()) : null;
|
||||||
freeAmount += value;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (shop.getShopType() == ShopType.NORMAL) {
|
if (r.transactionSuccess()) {
|
||||||
|
if (r2 != null) {
|
||||||
if (freeAmount >= leftAmount) {
|
|
||||||
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()) {
|
if (r2.transactionSuccess()) {
|
||||||
for (int i = leftAmount; i > 0; i--) {
|
addToInventory(inventory, product);
|
||||||
ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
|
removeFromInventory(executor.getInventory(), product);
|
||||||
soldProduct.setItemMeta(product.clone().getItemMeta());
|
executor.updateInventory();
|
||||||
inventory.addItem(soldProduct);
|
|
||||||
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()));
|
executor.sendMessage(Config.sell_success(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice(), shop.getVendor().getName()));
|
||||||
if (shop.getVendor().isOnline())
|
|
||||||
|
if (shop.getVendor().isOnline()) {
|
||||||
shop.getVendor().getPlayer().sendMessage(Config.someone_sold(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice(), executor.getName()));
|
shop.getVendor().getPlayer().sendMessage(Config.someone_sold(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice(), executor.getName()));
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.error_occurred(r2.errorMessage));
|
executor.sendMessage(Config.error_occurred(r2.errorMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.error_occurred(r.errorMessage));
|
removeFromInventory(executor.getInventory(), product);
|
||||||
|
executor.updateInventory();
|
||||||
|
executor.sendMessage(Config.sell_success_admin(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice()));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.vendor_not_enough_money());
|
executor.sendMessage(Config.error_occurred(r.errorMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
executor.sendMessage(Config.chest_not_enough_inventory_space());
|
executor.sendMessage(Config.chest_not_enough_inventory_space());
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (shop.getShopType() == ShopType.ADMIN) {
|
} else {
|
||||||
|
executor.sendMessage(Config.vendor_not_enough_money());
|
||||||
EconomyResponse r = econ.depositPlayer(executor, shop.getSellPrice());
|
|
||||||
|
|
||||||
if (r.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_admin(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice()));
|
|
||||||
} else {
|
|
||||||
executor.sendMessage(Config.error_occurred(r.errorMessage));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean addToInventory(Inventory inventory, ItemStack itemStack) {
|
||||||
|
HashMap<Integer, ItemStack> inventoryItems = new HashMap<>();
|
||||||
|
int amount = itemStack.getAmount();
|
||||||
|
int added = 0;
|
||||||
|
|
||||||
|
if (inventory instanceof PlayerInventory) {
|
||||||
|
if (Utils.getVersion(plugin.getServer()).contains("1_9")) {
|
||||||
|
inventoryItems.put(40, inventory.getItem(40));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 36; i++) {
|
||||||
|
inventoryItems.put(i, inventory.getItem(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
for (int i = 0; i < inventory.getSize(); i++) {
|
||||||
|
inventoryItems.put(i, inventory.getItem(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
slotLoop:
|
||||||
|
for (int slot : inventoryItems.keySet()) {
|
||||||
|
while (added < amount) {
|
||||||
|
ItemStack item = inventory.getItem(slot);
|
||||||
|
|
||||||
|
if (item != null) {
|
||||||
|
if (item.isSimilar(itemStack)) {
|
||||||
|
if (item.getAmount() != item.getMaxStackSize()) {
|
||||||
|
ItemStack newItemStack = new ItemStack(item);
|
||||||
|
newItemStack.setAmount(item.getAmount() + 1);
|
||||||
|
inventory.setItem(slot, newItemStack);
|
||||||
|
added++;
|
||||||
|
} else {
|
||||||
|
continue slotLoop;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
continue slotLoop;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ItemStack newItemStack = new ItemStack(itemStack);
|
||||||
|
newItemStack.setAmount(1);
|
||||||
|
inventory.setItem(slot, newItemStack);
|
||||||
|
added++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (added == amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean removeFromInventory(Inventory inventory, ItemStack itemStack) {
|
||||||
|
HashMap<Integer, ItemStack> inventoryItems = new HashMap<>();
|
||||||
|
int amount = itemStack.getAmount();
|
||||||
|
int removed = 0;
|
||||||
|
|
||||||
|
if (inventory instanceof PlayerInventory) {
|
||||||
|
if (Utils.getVersion(plugin.getServer()).contains("1_9")) {
|
||||||
|
inventoryItems.put(40, inventory.getItem(40));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 36; i++) {
|
||||||
|
inventoryItems.put(i, inventory.getItem(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
for (int i = 0; i < inventory.getSize(); i++) {
|
||||||
|
inventoryItems.put(i, inventory.getItem(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
slotLoop:
|
||||||
|
for (int slot : inventoryItems.keySet()) {
|
||||||
|
while (removed < amount) {
|
||||||
|
ItemStack item = inventory.getItem(slot);
|
||||||
|
|
||||||
|
if (item != null) {
|
||||||
|
if (item.isSimilar(itemStack)) {
|
||||||
|
if (item.getAmount() > 0) {
|
||||||
|
int newAmount = item.getAmount() - 1;
|
||||||
|
|
||||||
|
ItemStack newItemStack = new ItemStack(item);
|
||||||
|
newItemStack.setAmount(newAmount);
|
||||||
|
|
||||||
|
if (newAmount == 0)
|
||||||
|
inventory.setItem(slot, null);
|
||||||
|
else
|
||||||
|
inventory.setItem(slot, newItemStack);
|
||||||
|
|
||||||
|
removed++;
|
||||||
|
} else {
|
||||||
|
continue slotLoop;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
continue slotLoop;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
continue slotLoop;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (removed == amount);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,24 +1,49 @@
|
|||||||
package de.epiceric.shopchest.interfaces;
|
package de.epiceric.shopchest.interfaces;
|
||||||
|
|
||||||
import org.apache.commons.codec.binary.Base64;
|
import org.apache.commons.codec.binary.Base64;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.PlayerInventory;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
public abstract class Utils {
|
public abstract class Utils {
|
||||||
|
|
||||||
public static int getAmount(Inventory inventory, Material type, short damage, ItemMeta itemMeta) {
|
public static int getAmount(Inventory inventory, ItemStack itemStack) {
|
||||||
ItemStack[] items = inventory.getContents();
|
|
||||||
int amount = 0;
|
int amount = 0;
|
||||||
for (ItemStack item : items) {
|
|
||||||
if ((item != null) && (item.getType().equals(type)) && (item.getDurability() == damage) && (item.getAmount() > 0) && (item.getItemMeta().equals(itemMeta))) {
|
ArrayList<ItemStack> inventoryItems = new ArrayList<>();
|
||||||
amount += item.getAmount();
|
|
||||||
|
if (inventory instanceof PlayerInventory) {
|
||||||
|
if (getVersion(Bukkit.getServer()).contains("1_9")) {
|
||||||
|
inventoryItems.add(inventory.getItem(40));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 36; i++) {
|
||||||
|
inventoryItems.add(inventory.getItem(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
for (int i = 0; i < inventory.getSize(); i++) {
|
||||||
|
inventoryItems.add(inventory.getItem(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (ItemStack item : inventoryItems) {
|
||||||
|
if (item != null) {
|
||||||
|
if (item.isSimilar(itemStack)) {
|
||||||
|
amount += item.getAmount();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return amount;
|
return amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user