diff --git a/build.gradle.kts b/build.gradle.kts index 0a4fd15..c7b9561 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.2") { exclude(group = "org.yaml", module = "snakeyaml") } diff --git a/src/main/java/cn/dreeam/surf/util/ItemUtil.java b/src/main/java/cn/dreeam/surf/util/ItemUtil.java index 5a31f8b..8bdbded 100644 --- a/src/main/java/cn/dreeam/surf/util/ItemUtil.java +++ b/src/main/java/cn/dreeam/surf/util/ItemUtil.java @@ -5,6 +5,7 @@ import com.cryptomorin.xseries.XMaterial; import net.kyori.adventure.key.Key; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import org.bukkit.Keyed; import org.bukkit.Registry; import org.bukkit.attribute.Attribute; import org.bukkit.enchantments.Enchantment; @@ -325,7 +326,7 @@ private static List initIllegalItemFlags() { private static List initIllegalAttribute() { List list = new ArrayList<>(); - for (Attribute attribute : getAttributes()) { + for (Object attribute : getAttributes()) { list.add(attribute.toString()); } @@ -412,9 +413,9 @@ private static Attribute getAttributeByName(String name) { } } - private static Attribute[] getAttributes() { + private static Object[] getAttributes() { if (Util.isNewerThan(21, 1)) { - return Registry.ATTRIBUTE.stream().toArray(Attribute[]::new); + return Registry.ATTRIBUTE.stream().map(Keyed::getKey).toArray(Key[]::new); } try { @@ -422,7 +423,7 @@ private static Attribute[] getAttributes() { attributeValues = Attribute.class.getMethod("values"); } - return (Attribute[]) attributeValues.invoke(null); + return (Object[]) attributeValues.invoke(null); } catch (ReflectiveOperationException e) { Surf.LOGGER.error(e); return null;