diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java index 85bd0085..a2452b3c 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java @@ -28,10 +28,12 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo { private Map vanillaProfiles = new HashMap<>(); - @Shadow @Final + @Shadow + @Final private GameProfile gameProfile; - @Shadow Map playerTextures; + @Shadow + Map playerTextures; @SuppressWarnings("InvalidMemberReference") // mc-dev bug? @Redirect(method = {"getLocationSkin", "getLocationCape", "getLocationElytra"}, @@ -91,14 +93,12 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo { + "Lcom/mojang/authlib/GameProfile;" + "Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;" + "Z)V")) - private void redirectLoadPlayerTextures(SkinManager skinManager, GameProfile profile, SkinManager.SkinAvailableCallback callback, - boolean requireSecure) { + private void redirectLoadPlayerTextures(SkinManager skinManager, GameProfile profile, SkinManager.SkinAvailableCallback callback, boolean requireSecure) { skinManager.loadProfileTextures(profile, (typeIn, location, profileTexture) -> { - HDSkinManager.INSTANCE.parseSkin(profile, typeIn, location, profileTexture) - .thenAccept(v -> { - playerTextures.put(typeIn, location); - vanillaProfiles.put(typeIn, profileTexture); - }); + HDSkinManager.INSTANCE.parseSkin(profile, typeIn, location, profileTexture).thenAccept(v -> { + playerTextures.put(typeIn, location); + vanillaProfiles.put(typeIn, profileTexture); + }); }, requireSecure); } diff --git a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java index 092e6268..38ccd8a5 100644 --- a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java +++ b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java @@ -16,6 +16,7 @@ import com.minelittlepony.render.layer.LayerPonyCustomHead; import com.minelittlepony.render.layer.LayerPonyElytra; import net.minecraft.block.BlockBed; +import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.culling.ICamera; @@ -90,6 +91,9 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony