From 274d13a34bb694854eebbb9725265dbce4bf45aa Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 28 Jan 2020 12:40:44 +0200 Subject: [PATCH] Update HDSkins --- gradle.properties | 2 +- .../com/minelittlepony/client/hdskins/DummyPony.java | 8 ++++---- .../minelittlepony/client/hdskins/DummyPonyRenderer.java | 4 ++-- .../minelittlepony/client/hdskins/GuiSkinsMineLP.java | 8 ++++---- .../com/minelittlepony/client/hdskins/MineLPHDSkins.java | 9 +++++---- .../com/minelittlepony/client/hdskins/PonyPreview.java | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index c19f2d9c..41727966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ org.gradle.daemon=false # Dependencies modmenu_version=1.8.+ kirin_version=1.5.1-1.15.1-SNAPSHOT - hd_skins_version=6.0.2-1.15.1-SNAPSHOT + hd_skins_version=6.1-1.15.1-SNAPSHOT mson_version=1.1.8-1.15.1-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java index deca9874..b1cb2286 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java @@ -3,10 +3,10 @@ package com.minelittlepony.client.hdskins; import net.minecraft.entity.EntityCategory; import net.minecraft.entity.EntityType; -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.minelittlepony.hdskins.client.dummy.DummyPlayer; +import com.minelittlepony.hdskins.client.dummy.TextureProxy; +import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.client.resources.LocalTexture; import com.minelittlepony.model.IRotatedSwimmer; /** diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java index f2ad344b..5df75a3d 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java @@ -10,8 +10,8 @@ import com.minelittlepony.client.render.entity.feature.GearFeature; import com.minelittlepony.client.render.entity.feature.GlowingItemFeature; import com.minelittlepony.client.render.entity.feature.ArmourFeature; import com.minelittlepony.client.render.entity.feature.ElytraFeature; -import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer; -import com.minelittlepony.hdskins.profile.SkinType; +import com.minelittlepony.hdskins.client.dummy.DummyPlayerRenderer; +import com.minelittlepony.hdskins.skins.SkinType; import com.minelittlepony.mson.api.ModelKey; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java index b3923a2c..22c9b17f 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java @@ -3,10 +3,10 @@ package com.minelittlepony.client.hdskins; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.common.client.gui.element.IconicToggle; 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.hdskins.client.dummy.PlayerPreview; +import com.minelittlepony.hdskins.client.gui.GuiSkins; +import com.minelittlepony.hdskins.skins.SkinServerList; +import com.minelittlepony.hdskins.skins.SkinType; import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.minecraft.MinecraftProfileTexture; diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index 1c00c3e3..aed602e0 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -3,8 +3,9 @@ package com.minelittlepony.client.hdskins; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.common.event.ClientReadyCallback; -import com.minelittlepony.hdskins.SkinCacheClearCallback; -import com.minelittlepony.hdskins.profile.SkinType; +import com.minelittlepony.hdskins.client.SkinCacheClearCallback; +import com.minelittlepony.hdskins.client.gui.GuiSkins; +import com.minelittlepony.hdskins.skins.SkinType; import com.minelittlepony.mson.api.Mson; import com.mojang.authlib.GameProfile; @@ -12,7 +13,7 @@ import net.fabricmc.api.ClientModInitializer; import net.minecraft.util.Identifier; import com.minelittlepony.client.pony.PonyManager; -import com.minelittlepony.hdskins.HDSkins; +import com.minelittlepony.hdskins.client.HDSkins; /** * All the interactions with HD Skins. @@ -29,7 +30,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { SkinCacheClearCallback.EVENT.register(ponyManager::onSkinCacheCleared); // Ponify the skins GUI. - HDSkins.getInstance().getSkinServerList().setSkinsGui(GuiSkinsMineLP::new); + GuiSkins.setSkinsGui(GuiSkinsMineLP::new); }); // Preview on the select skin gui diff --git a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java index bed7be43..c82863ad 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java @@ -3,9 +3,9 @@ package com.minelittlepony.client.hdskins; 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.hdskins.client.dummy.DummyPlayer; +import com.minelittlepony.hdskins.client.dummy.PlayerPreview; +import com.minelittlepony.hdskins.skins.SkinType; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race;