Skip to content

Update CheckItemExpansion.java #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update CheckItemExpansion.java #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/com/extendedclip/papi/expansion/checkitem/CheckItemExpansion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,10 +1176,12 @@ private int getInt(String s) {
return -1;
}
}

@SuppressWarnings("deprecation")
private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) {
input = input.replaceAll("__", " ");
String regex = "(&#[a-fA-F0-9]{6}|&[a-fA-F0-9k-orK-OR])";
input = input.replaceAll(regex, "");
String[] arrayOfString;
int j = (arrayOfString = input.split("(?<!\\\\),")).length;
for (int i = 0; i < j; i++) {
Expand Down Expand Up @@ -1252,15 +1254,13 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) {
part = part.replace("enchantments:", "");
HashMap<Enchantment, Integer> enchantments = new HashMap<>();
String[] enchArray = part.split("(?<!\\\\);");
try { //This try is possibly useless, mending seems to work with getByName as well, no idea how I fixed it. Issue #10
try {
Class.forName("org.bukkit.enchantments.Enchantment").getMethod("getByKey", NamespacedKey.class);
for (String s : enchArray) {
String[] ench;
if ((ench = s.split("=")).length > 1) {
NamespacedKey key = NamespacedKey
.minecraft(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toLowerCase());
enchantments.put(Enchantment.getByKey(key),
Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1])));
NamespacedKey key = NamespacedKey.minecraft(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toLowerCase());
enchantments.put(Enchantment.getByKey(key), Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1])));
} else {
NamespacedKey key = NamespacedKey.minecraft(PlaceholderAPI.setBracketPlaceholders(p, s).toLowerCase());
enchantments.put(Enchantment.getByKey(key), -1);
Expand All @@ -1270,15 +1270,13 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) {
for (String s : enchArray) {
String[] ench;
if ((ench = s.split("=")).length > 1) {
enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toUpperCase()),
Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1])));
enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toUpperCase()), Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1])));
} else {
enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, s).toUpperCase()), -1);
}
}
} catch (IllegalArgumentException e) {
log(Level.WARNING, "Invalid Key for enchantment(s). -- Ignore if enchantment is blank on purpose");

} catch (Exception e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -1314,8 +1312,7 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) {
for (String s : nbtArray) {
String[] nbt;
if ((nbt = s.split("=")).length > 1) {
nbtStrings.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]),
PlaceholderAPI.setBracketPlaceholders(p, nbt[1]));
nbtStrings.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), PlaceholderAPI.setBracketPlaceholders(p, nbt[1]));
}
}
wrapper.setNbtStrings(nbtStrings);
Expand All @@ -1330,8 +1327,7 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) {
String[] nbt;
if ((nbt = s.split("=")).length > 1) {
try {
nbtInts.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]),
Integer.parseInt(PlaceholderAPI.setBracketPlaceholders(p, nbt[1])));
nbtInts.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), Integer.parseInt(PlaceholderAPI.setBracketPlaceholders(p, nbt[1])));
} catch (NumberFormatException e) {
}
}
Expand All @@ -1356,7 +1352,6 @@ else if (part.equals("off"))
wrapper.setCheckMainHand(true);
wrapper.setCheckOffHand(true);
}

continue;
}
if (part.equals("strict")) {
Expand All @@ -1367,7 +1362,6 @@ else if (part.equals("off"))
wrapper.setCheckEnchanted(true);
continue;
}

}
return wrapper;
}
Expand Down