502647092
/
TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Items.java

master
坏黑 2019-07-21 00:08:07 +08:00
parent 0f22556ec6
commit 6b4bf338f2
1 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/scala/io/izzel/taboolib/util/item/Items.java
View File

@ -69,6 +69,15 @@ public class Items {
} }
} }
public static Color asColor(String color) {
try {
String[] v = color.split("-");
return Color.fromBGR(Integer.valueOf(v[0]), Integer.valueOf(v[1]), Integer.valueOf(v[2]));
} catch (Exception e) {
return Color.fromBGR(0, 0, 0);
}
}
public static ItemFlag asItemFlag(String flag) { public static ItemFlag asItemFlag(String flag) {
try { try {
return ItemFlag.valueOf(flag); return ItemFlag.valueOf(flag);
@ -77,14 +86,6 @@ public class Items {
} }
} }
public static Color asColor(String color) {
try {
return Color.fromBGR(Integer.valueOf(color.split("-")[0]), Integer.valueOf(color.split("-")[1]), Integer.valueOf(color.split("-")[2]));
} catch (Exception e) {
return Color.fromBGR(0, 0, 0);
}
}
public static Enchantment asEnchantment(String enchant) { public static Enchantment asEnchantment(String enchant) {
try { try {
Enchantment enchantment = Enchantment.getByName(enchant); Enchantment enchantment = Enchantment.getByName(enchant);
@ -163,36 +164,45 @@ public class Items {
} }
public static boolean checkItem(Player player, ItemStack item, int amount, boolean remove) { public static boolean checkItem(Player player, ItemStack item, int amount, boolean remove) {
return checkItem(player.getInventory(), item, amount, remove); return hasItem(player.getInventory(), i -> i.isSimilar(item), amount);
} }
public static boolean checkItem(Inventory inventory, ItemStack item, int amount, boolean remove) { public static boolean checkItem(Inventory inventory, ItemStack item, int amount, boolean remove) {
int hasAmount = 0; return hasItem(inventory, i -> i.isSimilar(item), amount) && (!remove || takeItem(inventory, i -> i.isSimilar(item), amount));
for (ItemStack _item : inventory) { }
if (item.isSimilar(_item)) {
hasAmount += _item.getAmount(); public static boolean hasItem(Inventory inventory, Matcher matcher, int amount) {
} int checkAmount = amount;
} for (org.bukkit.inventory.ItemStack itemStack : inventory.getContents()) {
if (hasAmount < amount) { if (!isNull(itemStack) && matcher.match(itemStack)) {
return false; checkAmount -= itemStack.getAmount();
} if (checkAmount <= 0) {
int requireAmount = amount;
for (int i = 0; i < inventory.getSize() && remove; i++) {
ItemStack _item = inventory.getItem(i);
if (_item != null && _item.isSimilar(item)) {
if (_item.getAmount() < requireAmount) {
inventory.setItem(i, null);
requireAmount -= _item.getAmount();
} else if (_item.getAmount() == requireAmount) {
inventory.setItem(i, null);
return true;
} else {
_item.setAmount(_item.getAmount() - requireAmount);
return true; return true;
} }
} }
} }
return true; return false;
}
public static boolean takeItem(Inventory inventory, Matcher matcher, int amount) {
int takeAmount = amount;
ItemStack[] contents = inventory.getContents();
for (int i = 0; i < contents.length; i++) {
ItemStack itemStack = contents[i];
if (!isNull(itemStack) && matcher.match(itemStack)) {
takeAmount -= itemStack.getAmount();
if (takeAmount < 0) {
itemStack.setAmount(itemStack.getAmount() - (takeAmount + itemStack.getAmount()));
return true;
} else {
inventory.setItem(i, null);
if (takeAmount == 0) {
return true;
}
}
}
}
return false;
} }
public static ItemStack loadItem(ConfigurationSection section) { public static ItemStack loadItem(ConfigurationSection section) {
@ -310,4 +320,9 @@ public class Items {
} }
return NMS.handle().saveNBT(item, nbt); return NMS.handle().saveNBT(item, nbt);
} }
interface Matcher {
boolean match(ItemStack item);
}
} }