Use plugin NamespacedKey for data conversion key

Can't use API one cause if multiple API plugins need to convert they will clash :(

Author: srnyx

src/main/java/xyz/srnyx/annoyingapi/data/EntityData.java

@@ -50,22 +50,22 @@ public EntityData(@NotNull AnnoyingPlugin plugin, @NotNull Entity entity) {
      * <br>For 1.14+ (PDC), the entity will receive the {@code api_converted} key which indicates that the data has been converted, this will avoid duplicate conversion checks
      * <br>All old data (PDC/file) will be removed after conversion (to avoid duplicate/overwriting data)
      *
-     * @param   onlyTryOnce 1.14+ only. {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen), all old data will be removed even if it fails. If {@code false} and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
+     * @param   onlyTryOnce 1.14+ only | {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen). If {@code false}, the conversion failed previously, and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
      * @param   keys        only applicable for 1.14-1.16, otherwise it will convert all keys (no matter what is provided)
      *
      * @return              a map of keys that failed to convert (key, value) or {@code null} if an error occurred (only returns {@code null} if 1.14+ fails)
      */
     @Nullable @SuppressWarnings("deprecation")
     public Map<String, String> convertOldData(boolean onlyTryOnce, @Nullable Collection<String> keys) {
         // 1.14+ (persistent data container)
-        if (NAMESPACED_KEY_CONSTRUCTOR_STRING != null && NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null && PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD != null && PERSISTENT_DATA_CONTAINER_GET_METHOD != null && PERSISTENT_DATA_CONTAINER_SET_METHOD != null && PERSISTENT_DATA_TYPE_STRING != null && PERSISTENT_DATA_TYPE_BYTE != null) {
+        if (NAMESPACED_KEY_CONSTRUCTOR != null && PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD != null && PERSISTENT_DATA_CONTAINER_GET_METHOD != null && PERSISTENT_DATA_CONTAINER_SET_METHOD != null && PERSISTENT_DATA_TYPE_STRING != null && PERSISTENT_DATA_TYPE_BYTE != null) {
             final Object persistentDataContainer;
             final Object convertedKey;
             try {
                 // Get PDC
                 persistentDataContainer = PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(entity);
                 // Check if already converted
-                convertedKey = NAMESPACED_KEY_CONSTRUCTOR_STRING.newInstance("annoyingapi", "converted");
+                convertedKey = NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, "annoyingapi_converted");
                 if (PERSISTENT_DATA_CONTAINER_GET_METHOD.invoke(persistentDataContainer, convertedKey, PERSISTENT_DATA_TYPE_BYTE) != null) return Collections.emptyMap();
                 // Set converted key if onlyTryOnce is true
                 if (onlyTryOnce) PERSISTENT_DATA_CONTAINER_SET_METHOD.invoke(persistentDataContainer, convertedKey, PERSISTENT_DATA_TYPE_BYTE, (byte) 1);
@@ -95,7 +95,7 @@ public Map<String, String> convertOldData(boolean onlyTryOnce, @Nullable Collect
                 if (keys == null || keys.isEmpty()) return Collections.emptyMap();
                 try {
                      for (final String key : keys) {
-                         final Object namespacedKey = NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key);
+                         final Object namespacedKey = NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key);
                          namespacedKeys.put(key, namespacedKey);
                      }
                 } catch (final ReflectiveOperationException e) {
@@ -151,7 +151,7 @@ public Map<String, String> convertOldData(boolean onlyTryOnce, @Nullable Collect
     /**
      * Calls {@link #convertOldData(boolean, Collection)} with the given keys
      *
-     * @param   onlyTryOnce 1.14+ only. {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen), all old data will be removed even if it fails. If {@code false} and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
+     * @param   onlyTryOnce 1.14+ only | {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen). If {@code false}, the conversion failed previously, and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
      * @param   keys        only applicable for 1.14-1.16, otherwise it will convert all keys (no matter what is provided)
      *
      * @return              a map of keys that failed to convert (key, value) or {@code null} if an error occurred (only returns {@code null} if 1.14+ fails)
@@ -194,7 +194,7 @@ public Map<String, String> convertOldData(@NotNull String... keys) {
     /**
      * Calls {@link #convertOldData(boolean, Collection)} with {@code onlyTryOnce} set to {@code true} and {@code keys} set to {@code null}
      *
-     * @param   onlyTryOnce 1.14+ only. {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen), all old data will be removed even if it fails. If {@code false} and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
+     * @param   onlyTryOnce 1.14+ only | {@code true} to only try once to convert the data, even if it fails (so if run again, nothing will happen). If {@code false}, the conversion failed previously, and this is run again, it will try to convert again. If the data is successfully converted, this option doesn't matter
      *
      * @return              a map of keys that failed to convert (key, value) or {@code null} if an error occurred (only returns {@code null} if 1.14+ fails)
      *

src/main/java/xyz/srnyx/annoyingapi/data/ItemData.java

@@ -18,7 +18,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static xyz.srnyx.annoyingapi.reflection.org.bukkit.RefNamespacedKey.NAMESPACED_KEY_CONSTRUCTOR_PLUGIN;
+import static xyz.srnyx.annoyingapi.reflection.org.bukkit.RefNamespacedKey.NAMESPACED_KEY_CONSTRUCTOR;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.inventory.meta.RefItemMeta.ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.inventory.meta.tags.RefCustomItemTagContainer.*;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.inventory.meta.tags.RefItemTagType.ITEM_TAG_TYPE_STRING;
@@ -74,21 +74,21 @@ public void attemptItemNbtApi(@NotNull Runnable runnable) {
     @Override @Nullable
     public String get(@NotNull String key) {
         // 1.13.2+ (persistent data container or custom item tag container)
-        if (NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null) {
+        if (NAMESPACED_KEY_CONSTRUCTOR != null) {
             final ItemMeta meta = target.getItemMeta();
             if (meta == null) return null;
 
             // 1.14+ (persistent data container)
             if (PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD != null && PERSISTENT_DATA_CONTAINER_GET_METHOD != null && PERSISTENT_DATA_TYPE_STRING != null) try {
-                return (String) PERSISTENT_DATA_CONTAINER_GET_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key), PERSISTENT_DATA_TYPE_STRING);
+                return (String) PERSISTENT_DATA_CONTAINER_GET_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key), PERSISTENT_DATA_TYPE_STRING);
             } catch (final ReflectiveOperationException e) {
                 sendError("get", e);
                 return null;
             }
 
             // 1.13.2 (custom item tag container)
             if (ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD != null && CUSTOM_ITEM_TAG_CONTAINER_GET_CUSTOM_TAG_METHOD != null) try {
-                return (String) CUSTOM_ITEM_TAG_CONTAINER_GET_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key), ITEM_TAG_TYPE_STRING);
+                return (String) CUSTOM_ITEM_TAG_CONTAINER_GET_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key), ITEM_TAG_TYPE_STRING);
             } catch (final ReflectiveOperationException e) {
                 sendError("get", e);
                 return null;
@@ -110,7 +110,7 @@ public String get(@NotNull String key) {
     @Override
     protected boolean set(@NotNull String key, @NotNull String value) {
         // 1.13.2+ (persistent data container or custom item tag container)
-        if (NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null) {
+        if (NAMESPACED_KEY_CONSTRUCTOR != null) {
             final ItemMeta meta = target.getItemMeta();
             if (meta == null) {
                 sendError("set", null);
@@ -119,7 +119,7 @@ protected boolean set(@NotNull String key, @NotNull String value) {
 
             // 1.14+ (persistent data container)
             if (PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD != null && PERSISTENT_DATA_CONTAINER_SET_METHOD != null) try {
-                PERSISTENT_DATA_CONTAINER_SET_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key), PERSISTENT_DATA_TYPE_STRING, value);
+                PERSISTENT_DATA_CONTAINER_SET_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key), PERSISTENT_DATA_TYPE_STRING, value);
                 target.setItemMeta(meta);
                 return true;
             } catch (final ReflectiveOperationException e) {
@@ -129,7 +129,7 @@ protected boolean set(@NotNull String key, @NotNull String value) {
 
             // 1.13.2 (custom item tag container)
             if (ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD != null && CUSTOM_ITEM_TAG_CONTAINER_SET_CUSTOM_TAG_METHOD != null) try {
-                CUSTOM_ITEM_TAG_CONTAINER_SET_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key), ITEM_TAG_TYPE_STRING, value);
+                CUSTOM_ITEM_TAG_CONTAINER_SET_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key), ITEM_TAG_TYPE_STRING, value);
                 target.setItemMeta(meta);
                 return true;
             } catch (final ReflectiveOperationException e) {
@@ -153,7 +153,7 @@ protected boolean set(@NotNull String key, @NotNull String value) {
     @Override
     public boolean remove(@NotNull String key) {
         // 1.13.2+ (persistent data container or custom item tag container)
-        if (NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null) {
+        if (NAMESPACED_KEY_CONSTRUCTOR != null) {
             final ItemMeta meta = target.getItemMeta();
             if (meta == null) {
                 sendError("remove", null);
@@ -162,7 +162,7 @@ public boolean remove(@NotNull String key) {
 
             // 1.14+ (persistent data container)
             if (PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD != null && PERSISTENT_DATA_CONTAINER_REMOVE_METHOD != null) try {
-                PERSISTENT_DATA_CONTAINER_REMOVE_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key));
+                PERSISTENT_DATA_CONTAINER_REMOVE_METHOD.invoke(PERSISTENT_DATA_HOLDER_GET_PERSISTENT_DATA_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key));
                 target.setItemMeta(meta);
                 return true;
             } catch (final ReflectiveOperationException e) {
@@ -172,7 +172,7 @@ public boolean remove(@NotNull String key) {
 
             // 1.13.2 (custom item tag container)
             if (ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD != null && CUSTOM_ITEM_TAG_CONTAINER_REMOVE_CUSTOM_TAG_METHOD != null) try {
-                CUSTOM_ITEM_TAG_CONTAINER_REMOVE_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, key));
+                CUSTOM_ITEM_TAG_CONTAINER_REMOVE_CUSTOM_TAG_METHOD.invoke(ITEM_META_GET_CUSTOM_TAG_CONTAINER_METHOD.invoke(meta), NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, key));
                 target.setItemMeta(meta);
                 return true;
             } catch (final ReflectiveOperationException e) {

src/main/java/xyz/srnyx/annoyingapi/file/AnnoyingFile.java

@@ -35,7 +35,7 @@
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-import static xyz.srnyx.annoyingapi.reflection.org.bukkit.RefNamespacedKey.NAMESPACED_KEY_CONSTRUCTOR_PLUGIN;
+import static xyz.srnyx.annoyingapi.reflection.org.bukkit.RefNamespacedKey.NAMESPACED_KEY_CONSTRUCTOR;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttribute.ATTRIBUTE_ENUM;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.*;
 import static xyz.srnyx.annoyingapi.reflection.org.bukkit.attribute.RefAttributeModifier.RefOperation.ATTRIBUTE_MODIFIER_OPERATION_ENUM;
@@ -662,10 +662,10 @@ public Optional<Recipe> getRecipe(@NotNull String path, @Nullable UnaryOperator<
         // Shapeless
         if (section.getBoolean("shapeless")) {
             ShapelessRecipe shapeless;
-            if (SHAPELESS_RECIPE_CONSTRUCTOR != null && NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null) {
+            if (SHAPELESS_RECIPE_CONSTRUCTOR != null && NAMESPACED_KEY_CONSTRUCTOR != null) {
                 try {
                     // 1.12+
-                    shapeless = SHAPELESS_RECIPE_CONSTRUCTOR.newInstance(NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, name), result);
+                    shapeless = SHAPELESS_RECIPE_CONSTRUCTOR.newInstance(NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, name), result);
                 } catch (final InstantiationException | IllegalAccessException | InvocationTargetException e) {
                     // 1.11-
                     shapeless = new ShapelessRecipe(result);
@@ -682,10 +682,10 @@ public Optional<Recipe> getRecipe(@NotNull String path, @Nullable UnaryOperator<
 
         // Shaped
         ShapedRecipe shaped;
-        if (SHAPED_RECIPE_CONSTRUCTOR != null && NAMESPACED_KEY_CONSTRUCTOR_PLUGIN != null) {
+        if (SHAPED_RECIPE_CONSTRUCTOR != null && NAMESPACED_KEY_CONSTRUCTOR != null) {
             try {
                 // 1.12+
-                shaped = SHAPED_RECIPE_CONSTRUCTOR.newInstance(NAMESPACED_KEY_CONSTRUCTOR_PLUGIN.newInstance(plugin, name), result);
+                shaped = SHAPED_RECIPE_CONSTRUCTOR.newInstance(NAMESPACED_KEY_CONSTRUCTOR.newInstance(plugin, name), result);
             } catch (final InstantiationException | IllegalAccessException | InvocationTargetException e) {
                 // 1.11-
                 shaped = new ShapedRecipe(result);

src/main/java/xyz/srnyx/annoyingapi/reflection/org/bukkit/RefNamespacedKey.java

@@ -22,14 +22,10 @@ public class RefNamespacedKey {
      * 1.12+ org.bukkit.NamespacedKey#minecraft(String)
      */
     @Nullable public static final Method MINECRAFT_METHOD = ReflectionUtility.getMethod(1, 12, 0, NAMESPACED_KEY_CLASS, "minecraft", String.class);
-    /**
-     * 1.12+ org.bukkit.NamespacedKey(String, String)
-     */
-    @Nullable public static final Constructor<?> NAMESPACED_KEY_CONSTRUCTOR_STRING = ReflectionUtility.getConstructor(1, 12, 0, NAMESPACED_KEY_CLASS, String.class, String.class);
     /**
      * 1.12+ org.bukkit.NamespacedKey(org.bukkit.plugin.Plugin, String)
      */
-    @Nullable public static final Constructor<?> NAMESPACED_KEY_CONSTRUCTOR_PLUGIN = ReflectionUtility.getConstructor(1, 12, 0, NAMESPACED_KEY_CLASS, Plugin.class, String.class);
+    @Nullable public static final Constructor<?> NAMESPACED_KEY_CONSTRUCTOR = ReflectionUtility.getConstructor(1, 12, 0, NAMESPACED_KEY_CLASS, Plugin.class, String.class);
     /**
      * 1.12+ org.bukkit.NamespacedKey#getNamespace()
      */

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ authors:
   - srnyx
 website: https://srnyx.com
 
-main: ${mainPackage}.AnnoyingPlugin
+main: ${mainPackage}.${name}
 version: ${version}
 api-version: 1.13