minor opti with key handling

NamespacedKey internals are full of regex
DenizenScript · Jul 21, 2021 · b126bfc · b126bfc
1 parent 34fdc32
commit b126bfc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java
@@ -183,7 +183,7 @@ public BiomeNMS getBiomeAt(Block block) {
 
     public abstract ArrayList<String> containerListFlags(PersistentDataContainer container, String prefix);
 
-    public abstract boolean containerHas(PersistentDataContainer container, NamespacedKey key);
+    public abstract boolean containerHas(PersistentDataContainer container, String key);
 
-    public abstract String containerGetString(PersistentDataContainer container, NamespacedKey key);
+    public abstract String containerGetString(PersistentDataContainer container, String key);
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/DataPersistenceHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/DataPersistenceHelper.java
@@ -52,12 +52,12 @@ public static void setDenizenKey(PersistentDataHolder holder, String keyName, Ob
     }
 
     public static boolean hasDenizenKey(PersistentDataHolder holder, String keyName) {
-        return NMSHandler.getInstance().containerHas(holder.getPersistentDataContainer(), new NamespacedKey(Denizen.getInstance(), keyName));
+        return NMSHandler.getInstance().containerHas(holder.getPersistentDataContainer(), "denizen:" + keyName);
     }
 
     public static ObjectTag getDenizenKey(PersistentDataHolder holder, String keyName) {
         try {
-            String str = NMSHandler.getInstance().containerGetString(holder.getPersistentDataContainer(), new NamespacedKey(Denizen.getInstance(), keyName));
+            String str = NMSHandler.getInstance().containerGetString(holder.getPersistentDataContainer(), "denizen:" + keyName);
             if (str == null) {
                 return null;
             }

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/Handler.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/Handler.java
@@ -238,13 +238,13 @@ public ArrayList<String> containerListFlags(PersistentDataContainer container, S
     }
 
     @Override
-    public boolean containerHas(PersistentDataContainer container, NamespacedKey key) {
-        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key.toString());
+    public boolean containerHas(PersistentDataContainer container, String key) {
+        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key);
     }
 
     @Override
-    public String containerGetString(PersistentDataContainer container, NamespacedKey key) {
-        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key.toString());
+    public String containerGetString(PersistentDataContainer container, String key) {
+        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key);
         if (base instanceof NBTTagString) {
             return base.asString();
         }

diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/Handler.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/Handler.java
@@ -238,13 +238,13 @@ public ArrayList<String> containerListFlags(PersistentDataContainer container, S
     }
 
     @Override
-    public boolean containerHas(PersistentDataContainer container, NamespacedKey key) {
-        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key.toString());
+    public boolean containerHas(PersistentDataContainer container, String key) {
+        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key);
     }
 
     @Override
-    public String containerGetString(PersistentDataContainer container, NamespacedKey key) {
-        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key.toString());
+    public String containerGetString(PersistentDataContainer container, String key) {
+        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key);
         if (base instanceof NBTTagString) {
             return base.asString();
         }

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java
@@ -283,13 +283,13 @@ public ArrayList<String> containerListFlags(PersistentDataContainer container, S
     }
 
     @Override
-    public boolean containerHas(PersistentDataContainer container, NamespacedKey key) {
-        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key.toString());
+    public boolean containerHas(PersistentDataContainer container, String key) {
+        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key);
     }
 
     @Override
-    public String containerGetString(PersistentDataContainer container, NamespacedKey key) {
-        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key.toString());
+    public String containerGetString(PersistentDataContainer container, String key) {
+        NBTBase base = ((CraftPersistentDataContainer) container).getRaw().get(key);
         if (base instanceof NBTTagString) {
             return base.asString();
         }

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java
@@ -305,13 +305,13 @@ public ArrayList<String> containerListFlags(PersistentDataContainer container, S
     }
 
     @Override
-    public boolean containerHas(PersistentDataContainer container, NamespacedKey key) {
-        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key.toString());
+    public boolean containerHas(PersistentDataContainer container, String key) {
+        return ((CraftPersistentDataContainer) container).getRaw().containsKey(key);
     }
 
     @Override
-    public String containerGetString(PersistentDataContainer container, NamespacedKey key) {
-        net.minecraft.nbt.Tag base = ((CraftPersistentDataContainer) container).getRaw().get(key.toString());
+    public String containerGetString(PersistentDataContainer container, String key) {
+        net.minecraft.nbt.Tag base = ((CraftPersistentDataContainer) container).getRaw().get(key);
         if (base instanceof StringTag) {
             return base.getAsString();
         }