Fix #91

Author: NichtStudioCode

inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java

@@ -3,6 +3,7 @@
 import com.mojang.authlib.GameProfile;
 import org.bukkit.Bukkit;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
@@ -17,10 +18,15 @@ public class ReflectionRegistry {
     public static final Class<?> PAPER_PLUGIN_CLASS_LOADER_CLASS = getClassOrNull("io.papermc.paper.plugin.entrypoint.classloader.PaperPluginClassLoader");
     public static final Class<?> CB_CRAFT_META_SKULL_CLASS = getCBClass("inventory.CraftMetaSkull");
     public static final Class<?> CB_CRAFT_META_ITEM_CLASS = getCBClass("inventory.CraftMetaItem");
+    public static final Class<?> RESOLVABLE_PROFILE_CLASS = getClassOrNull("net.minecraft.world.item.component.ResolvableProfile");
+    
+    // Constructors
+    public static final Constructor<?> RESOLVABLE_PROFILE_FROM_GAME_PROFILE_CONSTRUCTOR = getConstructorOrNull(RESOLVABLE_PROFILE_CLASS, false, GameProfile.class);
 
     // Methods
     public static final Method PAPER_PLUGIN_CLASS_LOADER_GET_LOADED_JAVA_PLUGIN_METHOD;
     public static final Method CB_CRAFT_META_SKULL_SET_PROFILE_METHOD = getMethodOrNull(CB_CRAFT_META_SKULL_CLASS, true, "setProfile", GameProfile.class); // since spigot 1.14.4 or paper 1.15.1
+    public static final Method CB_CRAFT_META_SKULL_SET_RESOLVABLE_PROFILE_METHOD = getMethodOrNull(CB_CRAFT_META_SKULL_CLASS, true, "setProfile", RESOLVABLE_PROFILE_CLASS);
 
     // Fields
     public static final Field PLUGIN_CLASS_LOADER_PLUGIN_FIELD = getField(PLUGIN_CLASS_LOADER_CLASS, true, "plugin");

inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java

@@ -59,6 +59,19 @@ public class ReflectionUtils {
         }
     }
 
+    public static <T> @Nullable Constructor<T> getConstructorOrNull(@Nullable Class<T> clazz, boolean declared, @Nullable Class<?> @NotNull ... parameterTypes) {
+        if (clazz == null)
+            return null;
+        
+        try {
+            Constructor<T> constructor = declared ? clazz.getDeclaredConstructor(parameterTypes) : clazz.getConstructor(parameterTypes);
+            if (declared) constructor.setAccessible(true);
+            return constructor;
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+    
     public static <T> @NotNull T constructEmpty(@NotNull Class<?> clazz) {
         try {
             return (T) getConstructor(clazz, true).newInstance();
@@ -85,7 +98,10 @@ public class ReflectionUtils {
         }
     }
 
-    public static @Nullable Method getMethodOrNull(@NotNull Class<?> clazz, boolean declared, @NotNull String name, @NotNull Class<?> @NotNull ... parameterTypes) {
+    public static @Nullable Method getMethodOrNull(@Nullable Class<?> clazz, boolean declared, @NotNull String name, @Nullable Class<?> @NotNull ... parameterTypes) {
+        if (clazz == null)
+            return null;
+        
         try {
             Method method = declared ? clazz.getDeclaredMethod(name, parameterTypes) : clazz.getMethod(name, parameterTypes);
             if (declared) method.setAccessible(true);

invui-core/src/main/java/xyz/xenondevs/invui/item/builder/SkullBuilder.java

@@ -74,7 +74,10 @@ private void setGameProfile(@NotNull HeadTexture texture) {
         ItemMeta meta = item.getItemMeta();
 
         if (gameProfile != null) {
-            if (ReflectionRegistry.CB_CRAFT_META_SKULL_SET_PROFILE_METHOD != null) {
+            if (ReflectionRegistry.CB_CRAFT_META_SKULL_SET_RESOLVABLE_PROFILE_METHOD != null && ReflectionRegistry.RESOLVABLE_PROFILE_FROM_GAME_PROFILE_CONSTRUCTOR != null) {
+                Object resolvableProfile = ReflectionUtils.construct(ReflectionRegistry.RESOLVABLE_PROFILE_FROM_GAME_PROFILE_CONSTRUCTOR, gameProfile);
+                ReflectionUtils.invokeMethod(ReflectionRegistry.CB_CRAFT_META_SKULL_SET_RESOLVABLE_PROFILE_METHOD, meta, resolvableProfile);
+            } else if (ReflectionRegistry.CB_CRAFT_META_SKULL_SET_PROFILE_METHOD != null) {
                 ReflectionUtils.invokeMethod(ReflectionRegistry.CB_CRAFT_META_SKULL_SET_PROFILE_METHOD, meta, gameProfile);
             } else {
                 ReflectionUtils.setFieldValue(ReflectionRegistry.CB_CRAFT_META_SKULL_PROFILE_FIELD, meta, gameProfile);