amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-12 13:41:06 +00:00
Code Issues Projects Releases Wiki Activity

Add support for both hands when buying or selling something

Browse Source
This commit is contained in:
Eric 2016-05-27 16:22:40 +02:00
parent 4c022dd9dc
commit 099208de67
1 changed files with 94 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/de/epiceric/shopchest/event/InteractShop.java
View File

@ -366,6 +366,19 @@ public class InteractShop implements Listener{
} }
if (Utils.getVersion(Bukkit.getServer()).contains("1_9")) {
ItemStack item = inventory.getItem(40);
if (item == null) {
slotFree.put(40, product.getMaxStackSize());
} else {
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 amountToFullStack = product.getMaxStackSize() - amountInSlot;
slotFree.put(40, amountToFullStack);
}
}
}
int leftAmount = product.getAmount(); int leftAmount = product.getAmount();
int freeAmount = 0; int freeAmount = 0;
@ -390,7 +403,15 @@ public class InteractShop implements Listener{
ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
boughtProduct.setItemMeta(product.clone().getItemMeta()); boughtProduct.setItemMeta(product.clone().getItemMeta());
if (shop.getShopType() == ShopType.NORMAL) c.getInventory().removeItem(boughtProduct); if (shop.getShopType() == ShopType.NORMAL) c.getInventory().removeItem(boughtProduct);
inventory.addItem(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(); executor.updateInventory();
leftAmount--; leftAmount--;
} else if (leftAmount == 0) { } else if (leftAmount == 0) {
@ -411,7 +432,15 @@ public class InteractShop implements Listener{
if (leftAmount > 0) { if (leftAmount > 0) {
ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); ItemStack boughtProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
boughtProduct.setItemMeta(product.clone().getItemMeta()); boughtProduct.setItemMeta(product.clone().getItemMeta());
inventory.addItem(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(); executor.updateInventory();
leftAmount--; leftAmount--;
} else if (leftAmount == 0) { } else if (leftAmount == 0) {
@ -477,7 +506,27 @@ public class InteractShop implements Listener{
ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
soldProduct.setItemMeta(product.clone().getItemMeta()); soldProduct.setItemMeta(product.clone().getItemMeta());
inventory.addItem(soldProduct); inventory.addItem(soldProduct);
executor.getInventory().removeItem(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.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()));
@ -508,7 +557,27 @@ public class InteractShop implements Listener{
for (int i = leftAmount; i > 0; i--) { for (int i = leftAmount; i > 0; i--) {
ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
soldProduct.setItemMeta(product.clone().getItemMeta()); soldProduct.setItemMeta(product.clone().getItemMeta());
executor.getInventory().removeItem(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.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()));
@ -532,7 +601,27 @@ public class InteractShop implements Listener{
for (int i = leftAmount; i > 0; i--) { for (int i = leftAmount; i > 0; i--) {
ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability()); ItemStack soldProduct = new ItemStack(product.clone().getType(), 1, product.clone().getDurability());
soldProduct.setItemMeta(product.clone().getItemMeta()); soldProduct.setItemMeta(product.clone().getItemMeta());
executor.getInventory().removeItem(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.updateInventory();
} }
executor.sendMessage(Config.sell_success_admin(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice())); executor.sendMessage(Config.sell_success_admin(product.getAmount(), ItemNames.lookup(product), shop.getSellPrice()));