Merge pull request #223 from SoSeDiK/tagcheck

Allow checking nbt type alongside the key
tr7zw · May 6, 2023 · 662c0bb · 662c0bb
2 parents 5759b68 + c485f8c
commit 662c0bb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java b/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java
@@ -600,6 +600,8 @@ && getType(key) == NBTType.NBTTagIntArray) {
     }
 
     /**
+     * Checks whether the provided key exists
+     *
      * @param key String key
      * @return True if the key is set
      * @deprecated Use {@link #hasTag(String)} instead
@@ -610,6 +612,8 @@ public Boolean hasKey(String key) {
     }
 
     /**
+     * Checks whether the provided key exists
+     *
      * @param key String key
      * @return true, if the key is set
      */

diff --git a/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/iface/ReadableNBT.java b/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/iface/ReadableNBT.java
@@ -132,11 +132,24 @@ public interface ReadableNBT {
     UUID getUUID(String key);
 
     /**
+     * Checks whether the provided key exists
+     *
      * @param key String key
      * @return true, if the key is set
      */
     boolean hasTag(String key);
 
+    /**
+     * Checks whether the provided key exists and has the specified type
+     *
+     * @param key  String key
+     * @param type nbt tag type
+     * @return whether the key is set and has the specified type
+     */
+    default boolean hasTag(String key, NBTType type) {
+        return hasTag(key) && getType(key) == type;
+    }
+
     /**
      * @return Set of all stored Keys
      */