From 0804b17073a14b07496b6d825532d90560bfa7fd Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Mon, 31 Mar 2025 16:22:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D1.20~1.20.4?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/util/Reflections.java  | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
index 0be5bcf55..59fda7a65 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
@@ -5779,7 +5779,8 @@ public class Reflections {
 
     public static final Class<?> clazz$Shulker = requireNonNull(
             ReflectionUtils.getClazz(
-                    BukkitReflectionUtils.assembleMCClass("world.entity.monster.Shulker")
+                    BukkitReflectionUtils.assembleMCClass("world.entity.monster.Shulker"),
+                    BukkitReflectionUtils.assembleMCClass("world.entity.monster.EntityShulker")
             )
     );
 
@@ -5854,12 +5855,6 @@ public class Reflections {
         }
     }
 
-    public static final Method method$AttributeInstance$getModifier = requireNonNull(
-            ReflectionUtils.getMethod(
-                    clazz$AttributeInstance, clazz$AttributeModifier, clazz$ResourceLocation
-            )
-    );
-
     public static final Class<?> clazz$Attributes = requireNonNull(
             ReflectionUtils.getClazz(
                     BukkitReflectionUtils.assembleMCClass("world.entity.ai.attributes.Attributes"),
@@ -5884,11 +5879,11 @@ public class Reflections {
             })
             .orElse(null);
 
-    public static final Constructor<?> constructor$AttributeInstance = requireNonNull(
+    // 1.20.5+
+    public static final Constructor<?> constructor$AttributeInstance =
             ReflectionUtils.getConstructor(
                     clazz$AttributeInstance, clazz$Holder, Consumer.class
-            )
-    );
+            );
 
     public static final Method method$AttributeInstance$setBaseValue = requireNonNull(
             ReflectionUtils.getMethod(
@@ -5896,12 +5891,6 @@ public class Reflections {
             )
     );
 
-    public static final Constructor<?> constructor$MobEffectInstance = requireNonNull(
-            ReflectionUtils.getConstructor(
-                    clazz$MobEffectInstance, clazz$Holder, int.class, int.class, boolean.class, boolean.class, boolean.class
-            )
-    );
-
     public static final Constructor<?> constructor$ClientboundSetPassengersPacket = requireNonNull(
             ReflectionUtils.getDeclaredConstructor(
                     clazz$ClientboundSetPassengersPacket, clazz$FriendlyByteBuf