From 00d45b30c3e7580319295ddda3f23178acc2f4b1 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 27 Mar 2019 09:46:24 +0200 Subject: [PATCH] Update for the latest changes to HDSkins --- .../com/minelittlepony/client/MineLPClient.java | 10 +++++----- .../minelittlepony/client/PonySkinModifier.java | 14 ++++++++------ .../client/gui/hdskins/GuiSkinsMineLP.java | 2 +- .../client/render/RenderPonyMob.java | 4 ++-- .../tileentities/skull/PlayerSkullRenderer.java | 4 ++-- .../client/settings/ClientPonyConfig.java | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/client/java/com/minelittlepony/client/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java index 4c9ff37e..41f32784 100644 --- a/src/client/java/com/minelittlepony/client/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -6,10 +6,10 @@ import com.minelittlepony.client.gui.hdskins.GuiSkinsMineLP; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.common.client.gui.GuiHost; -import com.minelittlepony.hdskins.HDSkinManager; -import com.minelittlepony.hdskins.server.LegacySkinServer; -import com.minelittlepony.hdskins.server.SkinServer; -import com.minelittlepony.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.hdskins.HDSkins; +import com.minelittlepony.hdskins.net.LegacySkinServer; +import com.minelittlepony.hdskins.net.SkinServer; +import com.minelittlepony.hdskins.net.ValhallaSkinServer; import com.minelittlepony.settings.PonyConfig; import net.minecraft.client.Minecraft; @@ -71,7 +71,7 @@ public class MineLPClient extends MineLittlePony { */ void postInit(Minecraft minecraft) { - HDSkinManager manager = HDSkinManager.INSTANCE; + HDSkins manager = HDSkins.getInstance(); // manager.setSkinUrl(SKIN_SERVER_URL); // manager.setGatewayURL(GATEWAY_URL); manager.addSkinModifier(new PonySkinModifier()); diff --git a/src/client/java/com/minelittlepony/client/PonySkinModifier.java b/src/client/java/com/minelittlepony/client/PonySkinModifier.java index ab1410fe..72eeedfb 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinModifier.java +++ b/src/client/java/com/minelittlepony/client/PonySkinModifier.java @@ -8,17 +8,19 @@ public class PonySkinModifier implements ISkinModifier { public void convertSkin(ISkinModifier.IDrawer drawer) { int scale = drawer.getImage().getWidth() / 64; + // TODO: What are these numbers!? + //top, mirror - drawer.draw(scale, 60, 32, 58, 34, 58, 16, 60, 18); + // drawer.draw(scale, 60, 32, 58, 34, 58, 16, 60, 18, false, false); //bottom, mirror - drawer.draw(scale, 62, 32, 60, 34, 60, 16, 62, 18); + // drawer.draw(scale, 62, 32, 60, 34, 60, 16, 62, 18, false, false); //inside - drawer.draw(scale, 58, 34, 56, 48, 60, 18, 62, 32); + // drawer.draw(scale, 58, 34, 56, 48, 60, 18, 62, 32, false, false); //back - drawer.draw(scale, 60, 34, 58, 48, 58, 18, 60, 32); + // drawer.draw(scale, 60, 34, 58, 48, 58, 18, 60, 32, false, false); //outside - drawer.draw(scale, 62, 34, 60, 48, 56, 18, 58, 32); + // drawer.draw(scale, 62, 34, 60, 48, 56, 18, 58, 32, false, false); //back - drawer.draw(scale, 64, 34, 62, 48, 62, 18, 64, 32); + // drawer.draw(scale, 64, 34, 62, 48, 62, 18, 64, 32, false, false); } } diff --git a/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java index aba067a9..0844e8d3 100644 --- a/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -5,7 +5,7 @@ import com.minelittlepony.common.client.gui.IconicToggle; import com.minelittlepony.common.client.gui.Style; import com.minelittlepony.hdskins.gui.EntityPlayerModel; import com.minelittlepony.hdskins.gui.GuiSkins; -import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.net.SkinServer; import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; diff --git a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java index 20c2e250..d294f99a 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java @@ -9,7 +9,7 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.pony.IPony; import net.minecraft.client.renderer.GlStateManager; @@ -105,7 +105,7 @@ public abstract class RenderPonyMob extends RenderLiving @Override @Nonnull protected final ResourceLocation getEntityTexture(T entity) { - return HDSkinManager.INSTANCE.getConvertedSkin(getTexture(entity)); + return HDSkins.getInstance().getConvertedSkin(getTexture(entity)); } @Override diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java index a47a2e12..aff78018 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.model.components.ModelDeadMau5Ears; import com.minelittlepony.client.pony.Pony; import com.minelittlepony.client.render.RenderPony; -import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyLevel; import com.mojang.authlib.GameProfile; @@ -43,7 +43,7 @@ public class PlayerSkullRenderer extends PonySkull { deadMau5.setVisible(profile != null && "deadmau5".equals(profile.getName())); if (profile != null) { - ResourceLocation skin = HDSkinManager.INSTANCE.getTextures(profile).get(Type.SKIN); + ResourceLocation skin = HDSkins.getInstance().getTextures(profile).get(Type.SKIN); if (skin != null && Pony.getBufferedImage(skin) != null) { return skin; } diff --git a/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java b/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java index 6ab0c5fe..161e7cfe 100644 --- a/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java +++ b/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.settings; -import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyLevel; @@ -10,7 +10,7 @@ public abstract class ClientPonyConfig extends PonyConfig { public void setPonyLevel(PonyLevel ponylevel) { // only trigger reloads when the value actually changes if (ponylevel != getPonyLevel()) { - HDSkinManager.INSTANCE.parseSkins(); + HDSkins.getInstance().parseSkins(); } super.setPonyLevel(ponylevel);