Fix several XSkull issues related to 1.21.9 support

Fixes #376

Author: CryptoMorin

.github/ISSUE_TEMPLATE/bug-report.md

@@ -6,6 +6,8 @@ labels: 'bug'
 assignees: CryptoMorin
 ---
 
+Example of a good bug report: https://github.com/CryptoMorin/XSeries/issues/376
+
 ## Description
 A clear and concise description of what the bug is.
 

commons/src/main/java/com/cryptomorin/xseries/profiles/gameprofile/MojangGameProfile.java

@@ -24,11 +24,14 @@
 
 import com.cryptomorin.xseries.AbstractReferencedClass;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Multimap;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.UUID;
+import java.util.function.Consumer;
 
 public abstract class MojangGameProfile extends AbstractReferencedClass<GameProfile> {
     protected final GameProfile object;
@@ -46,16 +49,13 @@ public final GameProfile object() {
 
     public abstract PropertyMap properties();
 
-    public abstract void addProperty(Property property);
-
-    public abstract void addProperty(String name, String value);
-
-    public abstract void removeProperty(String name);
-
-    public abstract void setProperty(String name, String value);
+    public final MojangGameProfile copy() {
+        return copy(null);
+    }
 
-    public abstract MojangGameProfile copy();
+    public abstract MojangGameProfile copy(@Nullable Consumer<PropertyModifier> propertyModifier);
 
+    @Nullable
     public Property getProperty(String name) {
         return Iterables.getFirst(this.properties().get(name), null);
     }

core/src/main/java/com/cryptomorin/xseries/profiles/gameprofile/GameProfilerBuilder.java renamed to commons/src/main/java/com/cryptomorin/xseries/profiles/gameprofile/PropertyModifier.java

@@ -23,29 +23,28 @@
 package com.cryptomorin.xseries.profiles.gameprofile;
 
 import com.google.common.collect.Multimap;
-import com.google.common.collect.MultimapBuilder;
 import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
 
-import java.util.UUID;
-
-public final class GameProfilerBuilder {
-    private final String name;
-    private final UUID id;
+public final class PropertyModifier {
     private final Multimap<String, Property> properties;
 
-    public GameProfilerBuilder(String name, UUID id) {
-        this.name = name;
-        this.id = id;
-        this.properties = MultimapBuilder.hashKeys().arrayListValues().build();
+    public PropertyModifier(Multimap<String, Property> properties) {this.properties = properties;}
+
+    public void setProperty(String name, String value) {
+        properties.removeAll(name);
+        properties.put(name, new Property(name, value));
+    }
+
+    public void setProperty(String name, Property value) {
+        properties.removeAll(name);
+        properties.put(name, value);
     }
 
-    public GameProfilerBuilder addProperty(String name, String value) {
-        this.properties.put(name, new Property(name, value));
-        return this;
+    public void removeProperty(String name) {
+        properties.removeAll(name);
     }
 
-    public MojangGameProfile build() {
-        return XGameProfile.create(id, name, new PropertyMap(properties));
+    public Multimap<String, Property> getProperties() {
+        return properties;
     }
 }

commons/src/main/java/com/cryptomorin/xseries/profiles/gameprofile/property/MojangProperty.java

@@ -0,0 +1,54 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Crypto Morin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.cryptomorin.xseries.profiles.gameprofile.property;
+
+import com.cryptomorin.xseries.AbstractReferencedClass;
+import com.mojang.authlib.properties.Property;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public abstract class MojangProperty extends AbstractReferencedClass<Property> {
+    protected final Property object;
+
+    protected MojangProperty(Property object) {this.object = object;}
+
+    @Override
+    public final Property object() {
+        return object;
+    }
+
+
+    @NonNull
+    public abstract String name();
+
+    @NonNull
+    public abstract String value();
+
+    @Nullable
+    public abstract String signature();
+
+    @NonNull
+    public final Property copy() {
+        return new Property(name(), value(), signature());
+    }
+}

core/src/main/java/com/cryptomorin/xseries/profiles/PlayerProfiles.java

@@ -24,11 +24,9 @@
 
 import com.cryptomorin.xseries.profiles.gameprofile.MojangGameProfile;
 import com.cryptomorin.xseries.profiles.gameprofile.XGameProfile;
+import com.cryptomorin.xseries.profiles.gameprofile.property.XProperty;
 import com.cryptomorin.xseries.profiles.objects.transformer.ProfileTransformer;
 import com.cryptomorin.xseries.reflection.XReflection;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.MultimapBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -38,10 +36,10 @@
 import com.mojang.authlib.properties.PropertyMap;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Objects;
@@ -63,7 +61,7 @@ public final class PlayerProfiles {
      * It's not needed to change it every time, but it should be changed
      * if the XSeries internals are changed.
      */
-    private static final Property XSERIES_GAMEPROFILE_SIGNATURE = new Property(XSERIES_SIG, XReflection.XSERIES_VERSION);
+    private static final Property XSERIES_GAMEPROFILE_SIGNATURE = XProperty.create(XSERIES_SIG, XReflection.XSERIES_VERSION).object();
     private static final String TEXTURES_PROPERTY = "textures";
 
     public static final GameProfile NIL = createGameProfile(PlayerUUIDs.IDENTITY_UUID, XSERIES_SIG).object();
@@ -159,8 +157,7 @@ public static boolean hasTextures(MojangGameProfile profile) {
     public static MojangGameProfile profileFromHashAndBase64(String hash, String base64) {
         java.util.UUID uuid = java.util.UUID.nameUUIDFromBytes(hash.getBytes(StandardCharsets.UTF_8));
         MojangGameProfile profile = PlayerProfiles.createNamelessGameProfile(uuid);
-        PlayerProfiles.setTexturesProperty(profile, base64);
-        return profile;
+        return PlayerProfiles.setTexturesProperty(profile, base64);
     }
 
     @SuppressWarnings("deprecation")
@@ -180,7 +177,7 @@ public static void removeTimestamp(MojangGameProfile profile) {
      * Tries to unwrap a {@link GameProfile} from a {@link net.minecraft.world.item.component.ResolvableProfile}.
      */
     @Nullable
-    public static GameProfile unwrapProfile(@Nullable Object profile) throws Throwable {
+    public static GameProfile fromResolvableProfile(@Nullable Object profile) throws Throwable {
         if (profile == null) return null;
         if (!(profile instanceof GameProfile) && ProfilesCore.ResolvableProfile_gameProfile != null) {
             // Unwrap from ResolvableProfile
@@ -190,7 +187,7 @@ public static GameProfile unwrapProfile(@Nullable Object profile) throws Throwab
     }
 
     @Nullable
-    public static Object wrapProfile(@Nullable MojangGameProfile profile) throws Throwable {
+    public static Object toResolvableProfile(@Nullable MojangGameProfile profile) throws Throwable {
         if (profile == null) return null;
         if (ProfilesCore.ResolvableProfile$bukkitSupports) {
             return ProfilesCore.ResolvableProfile$constructor.invoke(profile.object());
@@ -223,9 +220,9 @@ public static GameProfile sanitizeProfile(GameProfile gameProfile) {
         return clone.object();
     }
 
-    public static void setTexturesProperty(MojangGameProfile profile, String texture) {
-        profile.removeProperty(TEXTURES_PROPERTY);
-        profile.addProperty(TEXTURES_PROPERTY, texture);
+    @Contract(pure = true)
+    public static MojangGameProfile setTexturesProperty(MojangGameProfile profile, String texture) {
+        return profile.copy(x -> x.setProperty(TEXTURES_PROPERTY, texture));
     }
 
     /**
@@ -234,6 +231,7 @@ public static void setTexturesProperty(MojangGameProfile profile, String texture
      * @param str The string to encode.
      * @return The Base64 encoded string.
      */
+    @Contract(pure = true)
     public static String encodeBase64(String str) {
         return Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8));
     }
@@ -245,6 +243,7 @@ public static String encodeBase64(String str) {
      * @return the decoded Base64 string if it is a valid Base64 string, or null if not.
      */
     @Nullable
+    @Contract(pure = true)
     public static String decodeBase64(String base64) {
         Objects.requireNonNull(base64, "Cannot decode null string");
         try {
@@ -255,10 +254,12 @@ public static String decodeBase64(String base64) {
         }
     }
 
+    @Contract(pure = true)
     public static MojangGameProfile createGameProfile(UUID uuid, String username) {
         return signXSeries(XGameProfile.create(uuid, username));
     }
 
+    @Contract(pure = true)
     public static MojangGameProfile createGameProfile(UUID uuid, String username, PropertyMap properties) {
         return signXSeries(XGameProfile.create(uuid, username, properties));
     }
@@ -268,27 +269,15 @@ public static MojangGameProfile createGameProfile(UUID uuid, String username, Pr
      * purposes, specially since we're directly messing with the server's internal cache
      * it should be there in case something goes wrong.
      */
+    @Contract(pure = true)
     public static MojangGameProfile signXSeries(MojangGameProfile profile) {
         // Just as an indicator that this is not a vanilla-created profile.
-        PropertyMap properties = profile.properties();
         // I don't think a single profile is being signed multiple times.
         // Even if it was, it might be helpful?
-        // properties.asMap().remove(DEFAULT_PROFILE_NAME); // Remove previous versions if any.
-        try {
-            Field props = PropertyMap.class.getDeclaredField("properties");
-            props.setAccessible(true);
-            ListMultimap<String, Property> newProps = MultimapBuilder.hashKeys().arrayListValues().build();
-            newProps.putAll(properties);
-            newProps.put(XSERIES_SIG, XSERIES_GAMEPROFILE_SIGNATURE);
-            props.set(properties, ImmutableMultimap.copyOf(newProps));
-
-            // properties.put(XSERIES_SIG, XSERIES_GAMEPROFILE_SIGNATURE);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        return profile;
+        return profile.copy(x -> x.setProperty(XSERIES_SIG, XSERIES_GAMEPROFILE_SIGNATURE));
     }
 
+    @Contract(pure = true)
     public static MojangGameProfile createNamelessGameProfile(UUID id) {
         return createGameProfile(id, XSERIES_SIG);
     }

core/src/main/java/com/cryptomorin/xseries/profiles/ProfilesCore.java

@@ -154,9 +154,9 @@ public final class ProfilesCore {
             // Added by Bukkit
             Object minecraftServer = MinecraftServer.method("public static MinecraftServer getServer()").reflect().invoke();
 
-            // Services is a record class.
+            // Services is a record class, it existed even in 1.21.8 but we don't need to switch.
             MinecraftClassHandle Services = ns.ofMinecraft("package nms.server; public class Services");
-            boolean usesServices = Services.exists();
+            boolean usesServices = XReflection.supports(1, 21, 9) && Services.exists();
             Object services = null;
             if (usesServices) {
                 services = MinecraftServer.method("public Services services()")

core/src/main/java/com/cryptomorin/xseries/profiles/builder/XSkull.java

@@ -94,13 +94,13 @@ public static ProfileInstruction<ItemStack> createItem() {
     /**
      * Creates a {@link ProfileInstruction} for an {@link ItemStack}.
      *
-     * @param stack The {@link ItemStack} to set the profile for.
+     * @param item The {@link ItemStack} to set the profile for.
      * @return A {@link ProfileInstruction} that sets the profile for the given {@link ItemStack}.
      */
     @NotNull
     @Contract(value = "_ -> new", pure = true)
-    public static ProfileInstruction<ItemStack> of(@NotNull ItemStack stack) {
-        return new ProfileInstruction<>(new ProfileContainer.ItemStackProfileContainer(stack));
+    public static ProfileInstruction<ItemStack> of(@NotNull ItemStack item) {
+        return new ProfileInstruction<>(new ProfileContainer.ItemStackProfileContainer(item));
     }
 
     /**

core/src/main/java/com/cryptomorin/xseries/profiles/gameprofile/XGameProfile.java

@@ -1,5 +1,6 @@
 package com.cryptomorin.xseries.profiles.gameprofile;
 
+import com.cryptomorin.xseries.reflection.XReflection;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.PropertyMap;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -11,20 +12,7 @@
 public class XGameProfile {
     private XGameProfile() {}
 
-    private static final boolean USE_RECORDS;
-
-    static {
-        boolean useRecords;
-
-        try {
-            Method isRecord = Class.class.getDeclaredMethod("isRecord");
-            useRecords = (boolean) isRecord.invoke(GameProfile.class);
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            useRecords = false;
-        }
-
-        USE_RECORDS = useRecords;
-    }
+    private static final boolean USE_RECORDS = XReflection.isRecord(GameProfile.class);
 
     @Nullable
     public static MojangGameProfile of(GameProfile gameProfile) {
@@ -34,7 +22,14 @@ public static MojangGameProfile of(GameProfile gameProfile) {
     }
 
     public static MojangGameProfile create(UUID id, String name, PropertyMap properties) {
-        return of(new GameProfile(id, name, properties));
+        if (USE_RECORDS) {
+            return of(new GameProfile(id, name, properties));
+        } else {
+            GameProfile gameProfile = new GameProfile(id, name);
+            MojangGameProfile converted = of(gameProfile);
+            converted.properties().putAll(properties);
+            return converted;
+        }
     }
 
     public static MojangGameProfile create(UUID id, String name) {