allow vanilla_tagged in scriptevent, add deprecation

DenizenScript · Apr 13, 2021 · 411ac59 · 411ac59
1 parent f210833
commit 411ac59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/denizenscript/denizencore/events/ScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/ScriptEvent.java
@@ -145,7 +145,7 @@ public boolean checkSwitch(String key, String value) {
             return CoreUtilities.equalsIgnoreCase(pathValue, value);
         }
 
-        public static HashSet<String> notSwitches = new HashSet<>(Arrays.asList("regex", "item_flagged", "world_flagged", "area_flagged", "inventory_flagged", "player_flagged", "npc_flagged", "entity_flagged"));
+        public static HashSet<String> notSwitches = new HashSet<>(Arrays.asList("regex", "item_flagged", "world_flagged", "area_flagged", "inventory_flagged", "player_flagged", "npc_flagged", "entity_flagged", "vanilla_tagged"));
 
         public ScriptPath(ScriptContainer container, String event, String rawEventPath) {
             this.event = event;

diff --git a/src/main/java/com/denizenscript/denizencore/utilities/Deprecations.java b/src/main/java/com/denizenscript/denizencore/utilities/Deprecations.java
@@ -194,6 +194,9 @@ public class Deprecations {
     // In Bukkit impl, Added 2019/10/03, deprecate officially by 2021.
     public static Warning inAreaSwitchFormat = new FutureWarning("The old 'in <area>' in-line event format is deprecated, use the switch format for 'in:<area>'.");
 
+    // In Bukkit impl, Added 2021/04/13, deprecate officially by 2022.
+    public static Warning materialHasDataPackTag = new FutureWarning("The tag 'MaterialTag.has_vanilla_data_tag[...]' is deprecated in favor of MaterialTag.vanilla_tags.contains[<name>]");
+
     // In Bukkit impl, Added 2020/03/05, deprecate officially by 2022.
     public static Warning oldPlayEffectSpecials = new FutureWarning("The playeffect input of forms like 'iconcrack_' have been deprecated in favor of using the special_data input (refer to meta docs).");