From 8885b1459395f3942e8cbfab992bad69b6c23d53 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 23 Aug 2019 11:12:20 +0200 Subject: [PATCH] Update HD Skins --- gradle.properties | 2 +- .../minelittlepony/client/hdskins/HDSkinsProxy.java | 4 ++-- .../minelittlepony/client/hdskins/gui/DummyPony.java | 4 ++-- .../client/hdskins/gui/DummyPonyRenderer.java | 6 +++--- .../client/hdskins/gui/GuiSkinsMineLP.java | 12 ++++++------ .../client/hdskins/gui/PonyPreview.java | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index ff346568..cd4a9a8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ kirin_version=1.14.4-1.4.4 - hd_skins_version=1.14.4-5.4.3 + hd_skins_version=1.14.4-5.5-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java b/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java index 76565a18..e4f2ce99 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java +++ b/src/main/java/com/minelittlepony/client/hdskins/HDSkinsProxy.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.hdskins; import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.hdskins.HDSkins; +import com.minelittlepony.hdskins.profile.SkinType; import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; import net.minecraft.util.Identifier; class HDSkinsProxy extends SkinsProxy { @@ -11,7 +11,7 @@ class HDSkinsProxy extends SkinsProxy { @Override public Identifier getSkinTexture(GameProfile profile) { - Identifier skin = HDSkins.getInstance().getTextures(profile).get(MinecraftProfileTexture.Type.SKIN); + Identifier skin = HDSkins.getInstance().getProfileRepository().getTextures(profile).get(SkinType.SKIN); if (skin != null) { return skin; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java index 392c438d..f34cf8a8 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.hdskins.gui; import com.minelittlepony.hdskins.dummy.DummyPlayer; import com.minelittlepony.hdskins.dummy.TextureProxy; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.hdskins.resources.LocalTexture; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; /** * Dummy model used for the skin uploading screen. @@ -19,7 +19,7 @@ public class DummyPony extends DummyPlayer { public void setWet(boolean wet) { this.wet = wet; - LocalTexture skin = getTextures().get(Type.SKIN); + LocalTexture skin = getTextures().get(SkinType.SKIN); if (wet && skin.getId() == PonyPreview.NO_SKIN_PONY) { skin.reset(); diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java index 64bdfb5b..59df8aff 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java @@ -11,9 +11,9 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyElytra; import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.blaze3d.platform.GlStateManager; import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; @@ -76,7 +76,7 @@ public class DummyPonyRenderer extends DummyPlayerRenderer>(this) { @Override protected Identifier getElytraTexture(DummyPony entity) { - return entity.getTextures().get(Type.ELYTRA).getId(); + return entity.getTextures().get(SkinType.ELYTRA).getId(); } }; } diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java index 4ade74eb..2bab9458 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java @@ -6,9 +6,9 @@ import com.minelittlepony.common.client.gui.style.Style; import com.minelittlepony.hdskins.dummy.PlayerPreview; import com.minelittlepony.hdskins.gui.GuiSkins; import com.minelittlepony.hdskins.net.SkinServerList; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import net.minecraft.item.Items; import net.minecraft.sound.SoundEvents; @@ -74,21 +74,21 @@ public class GuiSkinsMineLP extends GuiSkins { } @Override - public void onSetLocalSkin(Type type) { + public void onSetLocalSkin(SkinType type) { super.onSetLocalSkin(type); MineLittlePony.logger.debug("Invalidating old local skin, checking updated local skin"); - if (type == Type.SKIN) { - ponyManager.removePony(previewer.getLocal().getTextures().get(Type.SKIN).getId()); + if (type == SkinType.SKIN) { + ponyManager.removePony(previewer.getLocal().getTextures().get(SkinType.SKIN).getId()); } } @Override - public void onSetRemoteSkin(Type type, Identifier location, MinecraftProfileTexture profileTexture) { + public void onSetRemoteSkin(SkinType type, Identifier location, MinecraftProfileTexture profileTexture) { super.onSetRemoteSkin(type, location, profileTexture); MineLittlePony.logger.debug("Invalidating old remote skin, checking updated remote skin"); - if (type == Type.SKIN) { + if (type == SkinType.SKIN) { ponyManager.removePony(location); } } diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java index 5f2511dd..f1864f78 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java @@ -5,9 +5,9 @@ import net.minecraft.util.Identifier; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.hdskins.dummy.DummyPlayer; import com.minelittlepony.hdskins.dummy.PlayerPreview; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; class PonyPreview extends PlayerPreview { @@ -23,8 +23,8 @@ class PonyPreview extends PlayerPreview { } @Override - public Identifier getBlankSkin(Type type) { - if (type == Type.SKIN) { + public Identifier getBlankSkin(SkinType type) { + if (type == SkinType.SKIN) { // Initialization order means this method might be called before class members have been initialized. // This is something that needs to be fixed in HDSkins return localPony != null && localPony.wet ? NO_SKIN_SEAPONY : NO_SKIN_PONY; @@ -33,7 +33,7 @@ class PonyPreview extends PlayerPreview { } protected DummyPlayer ponify(DummyPlayer human, DummyPlayer pony) { - Identifier loc = human.getTextures().get(Type.SKIN).getId(); + Identifier loc = human.getTextures().get(SkinType.SKIN).getId(); if (loc == null) { return pony;