From 85b4c0bd8acc44cd5dc201071a5bc48601705df3 Mon Sep 17 00:00:00 2001 From: BlitzOffline <52609756+BlitzOffline@users.noreply.github.com> Date: Sat, 4 Oct 2025 01:05:35 +0300 Subject: [PATCH] Added support for latest SCore API (cor plugin for ExecutableItems and ExecutableBlocks). --- gradle/libs.versions.toml | 2 +- .../deluxemenus/hooks/ExecutableBlocksHook.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bd6d8d7d..fc90a73e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ oraxen = "1.190.0" mythiclib = "1.7.1-SNAPSHOT" mmoitems = "6.10-SNAPSHOT" papi = "2.11.6" -score = "4.24.3.5" +score = "5.25.3.9" sig = "1.5.0" bstats = "3.1.0" diff --git a/src/main/java/com/extendedclip/deluxemenus/hooks/ExecutableBlocksHook.java b/src/main/java/com/extendedclip/deluxemenus/hooks/ExecutableBlocksHook.java index 22184d73..58ec1bf2 100644 --- a/src/main/java/com/extendedclip/deluxemenus/hooks/ExecutableBlocksHook.java +++ b/src/main/java/com/extendedclip/deluxemenus/hooks/ExecutableBlocksHook.java @@ -1,9 +1,12 @@ package com.extendedclip.deluxemenus.hooks; import com.extendedclip.deluxemenus.cache.SimpleCache; -import com.ssomar.score.api.ExecutableBlocksAPI; +import com.ssomar.score.api.executableblocks.ExecutableBlocksAPI; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; + +import com.ssomar.score.api.executableblocks.config.ExecutableBlockInterface; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -20,9 +23,9 @@ public ItemStack getItem(@NotNull String... arguments) { } final ItemStack item = cache.computeIfAbsent(arguments[0], (id) -> { - final ItemStack result = ExecutableBlocksAPI.getExecutableBlock(arguments[0]); + final Optional result = ExecutableBlocksAPI.getExecutableBlocksManager().getExecutableBlock(arguments[0]); - return (result == null) ? null : result.clone(); + return result.map(executableBlockInterface -> executableBlockInterface.buildItem(1, Optional.empty())).orElse(null); }); return (item == null) ? new ItemStack(Material.STONE) : item.clone();