diff options
| author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-16 14:18:10 +0300 |
|---|---|---|
| committer | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-23 13:31:48 +0300 |
| commit | 4b477d0efdbb54460c3e58e515450565c350042a (patch) | |
| tree | 210d8e4751bfa12984a6cc54bf4160e805071096 /src/main/java/de/hysky/skyblocker/utils | |
| parent | 40096023d7c8cd80597d7aa27c2c601f8365c7d5 (diff) | |
| download | Skyblocker-4b477d0efdbb54460c3e58e515450565c350042a.tar.gz Skyblocker-4b477d0efdbb54460c3e58e515450565c350042a.tar.bz2 Skyblocker-4b477d0efdbb54460c3e58e515450565c350042a.zip | |
Revert ItemUtils.getHeadTexture change and add ItemUtils.getHeadTextureOptional instead
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/utils')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/ItemUtils.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java index 6b850b3b..6f98efa6 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java +++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java @@ -203,16 +203,22 @@ public class ItemUtils { return Codecs.GAME_PROFILE_PROPERTY_MAP.parse(JsonOps.INSTANCE, JsonParser.parseString("[{\"name\":\"textures\",\"value\":\"" + textureValue + "\"}]")).getOrThrow(); } - public static Optional<String> getHeadTexture(ItemStack stack) { - if (!stack.isOf(Items.PLAYER_HEAD) || !stack.contains(DataComponentTypes.PROFILE)) return Optional.empty(); + public static String getHeadTexture(ItemStack stack) { + if (!stack.isOf(Items.PLAYER_HEAD) || !stack.contains(DataComponentTypes.PROFILE)) return ""; Iterator<Property> iterator = stack.get(DataComponentTypes.PROFILE) .properties() .get("textures") .iterator(); - if (!iterator.hasNext()) return Optional.empty(); - return Optional.of(iterator.next().value()); + if (!iterator.hasNext()) return ""; + return iterator.next().value(); + } + + public static Optional<String> getHeadTextureOptional(ItemStack stack) { + String texture = getHeadTexture(stack); + if (texture == null) return Optional.empty(); + return Optional.of(texture); } public static ItemStack getSkyblockerStack() { |