From 0f9e865dc45f9a8b1560b8080a7951b8f05b2937 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 26 Sep 2023 21:13:16 +0100 Subject: [PATCH] Update hdskins --- gradle.properties | 4 ++-- .../minelittlepony/client/compat/hdskins/MineLPHDSkins.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 82d6b4a7..d73f68a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ org.gradle.daemon=false # Dependencies modmenu_version=8.0.0-beta.1 - kirin_version=1.16.0-beta.2+1.20.2 - hd_skins_version=6.11.0-beta.3+1.20.2 + kirin_version=1.16.0-beta.3+1.20.2 + hd_skins_version=6.11.0-beta.4+1.20.2 mson_version=1.9.0-beta.1 diff --git a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java index 0c76ef0d..0f232bfb 100644 --- a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java @@ -82,7 +82,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { if (entity instanceof AbstractClientPlayerEntity player) { PlayerSkins skins = PlayerSkins.of(player); if (skins != null) { - return skins.getProvidedSkinTypes(); + return skins.combined().getProvidedSkinTypes(); } } @@ -110,7 +110,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { } } - return Optional.of(player).map(PlayerSkins::of).map(skins -> skins.getSkin(type)); + return Optional.of(player).map(PlayerSkins::of).flatMap(skins -> skins.combined().getSkin(type)); } @Override