diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java index c2029d4b9..34ec2fa08 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java @@ -104,9 +104,9 @@ public abstract class BukkitItemFactory> extend } if (this.hasExternalRecipeSource) { for (Provider source : this.recipeIngredientSources) { - Optional id = source.id(item.getItem()); - if (id.isPresent()) { - return UniqueKey.create(Key.of(source.plugin(), StringUtils.toLowerCase(id.get()))); + String id = source.idOrNull(item.getItem()); + if (id != null) { + return UniqueKey.create(Key.of(source.plugin(), StringUtils.toLowerCase(id))); } } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/modifier/ExternalModifier.java b/core/src/main/java/net/momirealms/craftengine/core/item/modifier/ExternalModifier.java index a2277429b..2774c34c0 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/modifier/ExternalModifier.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/modifier/ExternalModifier.java @@ -62,12 +62,12 @@ public class ExternalModifier implements ItemDataModifier { try { ItemManager itemManager = CraftEngine.instance().itemManager(); Player player = context.player(); - Optional another = this.provider.build(this.id, player == null ? null : player.platformPlayer(), adapt(context)); - if (another.isEmpty()) { + I another = this.provider.buildOrNull(this.id, player == null ? null : player.platformPlayer(), adapt(context)); + if (another == null) { CraftEngine.instance().logger().warn("'" + this.id + "' could not be found in " + provider.plugin()); return item; } - Item anotherWrapped = itemManager.wrap(another.get()); + Item anotherWrapped = itemManager.wrap(another); item.merge(anotherWrapped); return item; } catch (Throwable e) { diff --git a/gradle.properties b/gradle.properties index 93addbf8d..73bd8304d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -57,7 +57,7 @@ jimfs_version=1.3.1 authlib_version=7.0.60 concurrent_util_version=0.0.8-SNAPSHOT bucket4j_version=8.15.0 -itembridge_version=1.0.10 +itembridge_version=1.0.12 # Proxy settings systemProp.socks.proxyHost=127.0.0.1