Skip to content

Commit

Permalink
material_flagged
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Oct 23, 2021
1 parent d97b070 commit caf9029
Showing 1 changed file with 52 additions and 41 deletions.
93 changes: 52 additions & 41 deletions plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,15 @@ public abstract class BukkitScriptEvent extends ScriptEvent {
//
// "<block>" usually indicates that a MaterialTag will be matched against.
// This means you can specify any valid block material name, like "stone" or "air".
// You can also use "vanilla_tagged:<vanilla_tag_name>".
// You can also use "vanilla_tagged:<vanilla_tag_name>" or "material_flagged:<flag_name>".
// You can also use "block" or "material" as catch-alls.
//
// "<item>" or similar expects of course an ItemTag.
// You can use any valid item material type like "stick", or the name of an item script, or "item" as a catch-all, or "potion" for any potion item.
// Items can also be used with an "item_flagged" secondary prefix, so for an event that has "with:<item>", you can also do "with:item_flagged:<flag name>".
// For item matchers that aren't switches, this works similarly, like "on player consumes item_flagged:myflag:" (note that this is not a switch).
// You can also use "vanilla_tagged:<vanilla_tag_name>" to check vanilla tags, or "item_enchanted:<enchantment>" to check enchantments.
// You can also use "vanilla_tagged:<vanilla_tag_name>" to check vanilla tags, or "material_flagged:<flag_name>" to check material flags (not item flags),
// or "item_enchanted:<enchantment>" to check enchantments.
// You can also use "raw_exact:<item>" to do an exact raw item data comparison (almost always a bad idea to use).
//
// "<entity>", "<projectile>", "<vehicle>", etc. are examples of where an EntityTag will be expected.
Expand Down Expand Up @@ -951,43 +952,48 @@ public static boolean tryItem(ItemTag item, String comparedto) {
}
String rawComparedTo = comparedto;
comparedto = CoreUtilities.toLowerCase(comparedto);
if (comparedto.startsWith("item_flagged:")) {
for (String flag : CoreUtilities.split(rawComparedTo.substring("item_flagged:".length()), '|')) {
if (!item.getFlagTracker().hasFlag(flag)) {
return false;
if (comparedto.contains(":")) {
if (comparedto.startsWith("item_flagged:")) {
for (String flag : CoreUtilities.split(rawComparedTo.substring("item_flagged:".length()), '|')) {
if (!item.getFlagTracker().hasFlag(flag)) {
return false;
}
}
return true;
}
return true;
}
if (comparedto.startsWith("item_enchanted:")) {
String enchMatcher = comparedto.substring("item_enchanted:".length());
if (!item.getItemMeta().hasEnchants()) {
else if (comparedto.startsWith("item_enchanted:")) {
String enchMatcher = comparedto.substring("item_enchanted:".length());
if (!item.getItemMeta().hasEnchants()) {
return false;
}
for (Enchantment enchant : item.getItemMeta().getEnchants().keySet()) {
if (runGenericCheck(enchMatcher, enchant.getKey().getKey())) {
return true;
}
}
return false;
}
for (Enchantment enchant : item.getItemMeta().getEnchants().keySet()) {
if (runGenericCheck(enchMatcher, enchant.getKey().getKey())) {
return true;
}
else if (comparedto.startsWith("raw_exact:")) {
ItemTag compareItem = ItemTag.valueOf(rawComparedTo.substring("raw_exact:".length()), CoreUtilities.errorButNoDebugContext);
return compareItem != null && compareItem.matchesRawExact(item);
}
return false;
}
if (comparedto.startsWith("raw_exact:")) {
ItemTag compareItem = ItemTag.valueOf(rawComparedTo.substring("raw_exact:".length()), CoreUtilities.errorButNoDebugContext);
return compareItem != null && compareItem.matchesRawExact(item);
}
if (comparedto.startsWith("vanilla_tagged:")) {
String tagCheck = comparedto.substring("vanilla_tagged:".length());
HashSet<String> tags = VanillaTagHelper.tagsByMaterial.get(item.getItemStack().getType());
if (tags == null) {
else if (comparedto.startsWith("vanilla_tagged:")) {
String tagCheck = comparedto.substring("vanilla_tagged:".length());
HashSet<String> tags = VanillaTagHelper.tagsByMaterial.get(item.getItemStack().getType());
if (tags == null) {
return false;
}
MatchHelper matcher = createMatcher(tagCheck);
for (String tag : tags) {
if (matcher.doesMatch(tag)) {
return true;
}
}
return false;
}
MatchHelper matcher = createMatcher(tagCheck);
for (String tag : tags) {
if (matcher.doesMatch(tag)) {
return true;
}
else if (comparedto.startsWith("material_flagged:")) {
return item.getMaterial().getFlagTracker().hasFlag(comparedto.substring("material_flagged:".length()));
}
return false;
}
if (comparedto.equals("item")) {
return true;
Expand Down Expand Up @@ -1021,19 +1027,24 @@ public static boolean tryMaterial(Material mat, String comparedto) {
if (comparedto.equals("block") || comparedto.equals("material")) {
return true;
}
if (comparedto.startsWith("vanilla_tagged:")) {
String tagCheck = comparedto.substring("vanilla_tagged:".length());
HashSet<String> tags = VanillaTagHelper.tagsByMaterial.get(mat);
if (tags == null) {
if (comparedto.contains(":")) {
if (comparedto.startsWith("vanilla_tagged:")) {
String tagCheck = comparedto.substring("vanilla_tagged:".length());
HashSet<String> tags = VanillaTagHelper.tagsByMaterial.get(mat);
if (tags == null) {
return false;
}
MatchHelper matcher = createMatcher(tagCheck);
for (String tag : tags) {
if (matcher.doesMatch(tag)) {
return true;
}
}
return false;
}
MatchHelper matcher = createMatcher(tagCheck);
for (String tag : tags) {
if (matcher.doesMatch(tag)) {
return true;
}
else if (comparedto.startsWith("material_flagged:")) {
return new MaterialTag(mat).getFlagTracker().hasFlag(comparedto.substring("material_flagged:".length()));
}
return false;
}
MaterialTag quickOf = MaterialTag.quickOfNamed(comparedto);
if (quickOf != null) {
Expand Down

0 comments on commit caf9029

Please sign in to comment.