Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixed a few issues with `XSkull` * Added more documentations to `XReflection` with a few renames. * Changed the default material for `XItemStack` (Fixes #275)
- Loading branch information
1 parent
01fb76f
commit 219f510
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| package com.cryptomorin.xseries.profiles; | ||
|
|
||
| import com.google.common.collect.Iterables; | ||
| import com.mojang.authlib.GameProfile; | ||
| import com.mojang.authlib.properties.Property; | ||
| import com.mojang.authlib.properties.PropertyMap; | ||
| import org.bukkit.Bukkit; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
@@ -28,7 +27,7 @@ public final class PlayerProfiles { | |
| private static final Property XSERIES_GAMEPROFILE_SIGNATURE = new Property(DEFAULT_PROFILE_NAME, "true"); | ||
| public static final String TEXTURES_PROPERTY = "textures"; | ||
|
|
||
| public static final GameProfile NIL = createGameProfile(PlayerUUIDs.IDENTITY_UUID, DEFAULT_PROFILE_NAME); | ||
|
|
||
|
|
||
| /** | ||
|
|
@@ -51,6 +50,7 @@ public final class PlayerProfiles { | |
| public static final String TEXTURES_BASE_URL = "http://textures.minecraft.net/texture/"; | ||
|
|
||
| public static Optional<Property> getTextureProperty(GameProfile profile) { | ||
| // This is the property with Base64 encoded value. | ||
| return Optional.ofNullable(Iterables.getFirst(profile.getProperties().get(TEXTURES_PROPERTY), null)); | ||
| } | ||
|
|
||
|
|
@@ -69,17 +69,14 @@ public static String getSkinValue(@Nonnull GameProfile profile) { | |
|
|
||
| /** | ||
| * Retrieves the value of a {@link Property}, handling differences between versions. | ||
| * @since 4.0.1 | ||
| */ | ||
| public static String getPropertyValue(Property property) { | ||
| if (ProfilesCore.NULLABILITY_RECORD_UPDATE) return property.value(); | ||
| try { | ||
| return (String) ProfilesCore.Property_getValue.invoke(property); | ||
| } catch (Throwable throwable) { | ||
| throw new RuntimeException("Unable to get a property value: " + property, throwable); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -93,7 +90,6 @@ public static boolean hasTextures(GameProfile profile) { | |
| return getTextureProperty(profile).isPresent(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructs a {@link GameProfile} using the provided texture hash and base64 string. | ||
| * | ||
|
|
@@ -112,35 +108,25 @@ public static GameProfile profileFromHashAndBase64(String hash, String base64) { | |
| } | ||
|
|
||
| /** | ||
| * Uses the online/offline UUID depending on {@link Bukkit#getOnlineMode()}. | ||
| * @return may return the same or a new profile. | ||
| * | ||
| * @param profile must have complete name and UUID | ||
| */ | ||
| public static GameProfile sanitizeProfile(GameProfile profile) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
CryptoMorin
Author
Owner
|
||
| // We could remove the unnecessary timestamp data, but let's keep it there, the texture is Base64 encoded anyway. | ||
| // It doesn't affect it in terms of performance. | ||
| // The timestamp property is the last time the values have been updated, this | ||
| // is instant in most cases, but are sometimes a few minutes? (or hours?) behind | ||
| // because of Mojang server's cache. | ||
|
|
||
| // The stored cache UUID must be according to online/offline servers. | ||
| if (PlayerUUIDs.isOnlineMode()) return profile; | ||
| UUID offlineId = PlayerUUIDs.getOfflineUUID(profile.getName()); | ||
| PlayerUUIDs.ONLINE_TO_OFFLINE.put(profile.getId(), offlineId); | ||
|
|
||
| GameProfile clone = createGameProfile(offlineId, profile.getName()); | ||
| clone.getProperties().putAll(profile.getProperties()); | ||
| return clone; | ||
| } | ||
|
|
||
|
|
@@ -182,6 +168,15 @@ public static String decodeBase64(String base64) { | |
| } | ||
| } | ||
|
|
||
| public static GameProfile createGameProfile(UUID uuid, String username) { | ||
| return signXSeries(new GameProfile(uuid, username)); | ||
| } | ||
|
|
||
| /** | ||
| * All {@link GameProfile} created/modified by this library should have a special signature for debugging | ||
| * purposes, specially since we're directly messing with the server's internal cache | ||
| * it should be there in case something goes wrong. | ||
| */ | ||
| public static GameProfile signXSeries(GameProfile profile) { | ||
| // Just as an indicator that this is not a vanilla-created profile. | ||
| PropertyMap properties = profile.getProperties(); | ||
|
|
@@ -190,6 +185,6 @@ public static GameProfile signXSeries(GameProfile profile) { | |
| } | ||
|
|
||
| public static GameProfile createNamelessGameProfile(UUID id) { | ||
| return createGameProfile(id, DEFAULT_PROFILE_NAME); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
The timestamp does affect the generated Base64, as it will be different after restarts. Removing it ensures that it stays constant without causing stacking issues