Skull improvements

eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java

@@ -376,12 +376,12 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
             PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this));
         }
 
-        this.loadIntegrationLoaders().forEach((integrationLoader -> {
+        this.loadIntegrationLoaders().forEach(integrationLoader -> {
             if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
                 this.loadedIntegrations.add(integrationLoader.getPluginName());
                 integrationLoader.load();
             }
-        }));
+        });
 
         this.getLogger().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations()));
 

eco-api/src/main/java/com/willfp/eco/core/items/Items.java

@@ -222,7 +222,10 @@ public final class Items {
 
             if (part == null && PROVIDERS.containsKey(namespace)) {
                 ItemProvider provider = PROVIDERS.get(namespace);
-                item = provider.provideForKey(keyID);
+
+                String reformattedKey = keyID.replace("__", ":");
+
+                item = provider.provideForKey(reformattedKey);
                 if (item instanceof EmptyTestableItem || item == null) {
                     return new EmptyTestableItem();
                 }

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/Skull.kt

@@ -20,6 +20,10 @@ class Skull : SkullProxy {
             setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
             setProfile.isAccessible = true
         }
+        if (base64.length < 20) {
+            return
+        }
+
         val uuid = UUID(
             base64.substring(base64.length - 20).hashCode().toLong(),
             base64.substring(base64.length - 10).hashCode().toLong()
@@ -39,6 +43,6 @@ class Skull : SkullProxy {
         val profile = profile[meta] as GameProfile? ?: return null
         val properties = profile.properties ?: return null
         val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.value
+        return prop.toMutableList().firstOrNull()?.name
     }
 }

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/Skull.kt

@@ -20,6 +20,10 @@ class Skull : SkullProxy {
             setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
             setProfile.isAccessible = true
         }
+        if (base64.length < 20) {
+            return
+        }
+
         val uuid = UUID(
             base64.substring(base64.length - 20).hashCode().toLong(),
             base64.substring(base64.length - 10).hashCode().toLong()
@@ -39,6 +43,6 @@ class Skull : SkullProxy {
         val profile = profile[meta] as GameProfile? ?: return null
         val properties = profile.properties ?: return null
         val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.value
+        return prop.toMutableList().firstOrNull()?.name
     }
 }

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/Skull.kt

@@ -20,6 +20,10 @@ class Skull : SkullProxy {
             setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
             setProfile.isAccessible = true
         }
+        if (base64.length < 20) {
+            return
+        }
+
         val uuid = UUID(
             base64.substring(base64.length - 20).hashCode().toLong(),
             base64.substring(base64.length - 10).hashCode().toLong()
@@ -39,6 +43,6 @@ class Skull : SkullProxy {
         val profile = profile[meta] as GameProfile? ?: return null
         val properties = profile.properties ?: return null
         val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.value
+        return prop.toMutableList().firstOrNull()?.name
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt

@@ -21,7 +21,9 @@ class CustomItemsItemsAdder : CustomItemsIntegration {
 
     private class ItemsAdderProvider : ItemProvider("itemsadder") {
         override fun provideForKey(key: String): TestableItem? {
-            val item = CustomStack.getInstance("itemsadder:$key") ?: return null
+            val internalId = if (key.contains(":")) key else "itemsadder:$key"
+
+            val item = CustomStack.getInstance(internalId) ?: return null
             val id = item.id
             val namespacedKey = NamespacedKeyUtils.create("itemsadder", key)
             val stack = item.itemStack
@@ -34,6 +36,5 @@ class CustomItemsItemsAdder : CustomItemsIntegration {
                 stack
             )
         }
-
     }
-}
+}

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.35.4
+version = 6.35.5
 plugin-name = eco
 kotlin.code.style = official