Improve 1.21.2+ compatibility

Winds-Studio · Dec 18, 2024 · 80f24f7 · 80f24f7
1 parent e94917e
commit 80f24f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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<String> initIllegalItemFlags() {
     private static List<String> initIllegalAttribute() {
         List<String> list = new ArrayList<>();
 
-        for (Attribute attribute : getAttributes()) {
+        for (Object attribute : getAttributes()) {
             list.add(attribute.toString());
         }
 
@@ -412,17 +413,17 @@ 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 {
             if (attributeValues == null) {
                 attributeValues = Attribute.class.getMethod("values");
             }
 
-            return (Attribute[]) attributeValues.invoke(null);
+            return (Object[]) attributeValues.invoke(null);
         } catch (ReflectiveOperationException e) {
             Surf.LOGGER.error(e);
             return null;