Re-organise package structure

src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java

@@ -18,13 +18,16 @@ import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo;
 import com.voxelmodpack.hdskins.gui.GuiSkins;
-import com.voxelmodpack.hdskins.resource.SkinResourceManager;
-import com.voxelmodpack.hdskins.skins.BethlehemSkinServer;
-import com.voxelmodpack.hdskins.skins.LegacySkinServer;
-import com.voxelmodpack.hdskins.skins.ServerType;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.ValhallaSkinServer;
+import com.voxelmodpack.hdskins.resources.SkinResourceManager;
+import com.voxelmodpack.hdskins.resources.TextureLoader;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+import com.voxelmodpack.hdskins.server.BethlehemSkinServer;
+import com.voxelmodpack.hdskins.server.LegacySkinServer;
+import com.voxelmodpack.hdskins.server.ServerType;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
 import com.voxelmodpack.hdskins.util.CallableFutures;
 import com.voxelmodpack.hdskins.util.MoreStreams;
 import com.voxelmodpack.hdskins.util.PlayerUtil;

src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java

@@ -12,11 +12,12 @@ import com.mumfrey.liteloader.modconfig.ConfigStrategy;
 import com.mumfrey.liteloader.modconfig.ExposableOptions;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
-import com.voxelmodpack.hdskins.gui.GLWindow;
 import com.voxelmodpack.hdskins.gui.HDSkinsConfigPanel;
 import com.voxelmodpack.hdskins.gui.RenderPlayerModel;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServerSerializer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServerSerializer;
+import com.voxelmodpack.hdskins.upload.GLWindow;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.resources.IReloadableResourceManager;

src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java

@@ -1,9 +1,10 @@
 package com.voxelmodpack.hdskins;
 
+import com.voxelmodpack.hdskins.upload.IFileDialog;
+import com.voxelmodpack.hdskins.upload.ThreadOpenFilePNG;
+import com.voxelmodpack.hdskins.upload.ThreadSaveFilePNG;
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
-import com.voxelmodpack.hdskins.upload.awt.IFileDialog;
-import com.voxelmodpack.hdskins.upload.awt.ThreadSaveFilePNG;
-import com.voxelmodpack.hdskins.upload.awt.ThreadOpenFilePNG;
+
 import net.minecraft.client.Minecraft;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;

src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java

@@ -14,10 +14,11 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
+import com.voxelmodpack.hdskins.resources.PreviewTextureManager;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinUpload;
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import com.voxelmodpack.hdskins.util.NetClient;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinUpload;
 
 import java.io.Closeable;
 import java.io.File;

src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.ducks;
 
 public interface INetworkPlayerInfo {
 

src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java

@@ -4,9 +4,10 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
-import com.voxelmodpack.hdskins.LocalTexture;
-import com.voxelmodpack.hdskins.LocalTexture.IBlankSkinSupplier;
 import com.voxelmodpack.hdskins.SkinUploader;
+import com.voxelmodpack.hdskins.resources.LocalTexture;
+import com.voxelmodpack.hdskins.resources.LocalTexture.IBlankSkinSupplier;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.entity.EntityLivingBase;

src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java

@@ -10,8 +10,9 @@ import com.voxelmodpack.hdskins.HDSkinManager;
 import com.voxelmodpack.hdskins.SkinChooser;
 import com.voxelmodpack.hdskins.SkinUploader;
 import com.voxelmodpack.hdskins.SkinUploader.ISkinUploadHandler;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 import com.voxelmodpack.hdskins.util.CallableFutures;
-import com.voxelmodpack.hdskins.skins.SkinServer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;

src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java

@@ -5,6 +5,7 @@ import com.minelittlepony.gui.Checkbox;
 import com.minelittlepony.gui.SettingsPanel;
 import com.voxelmodpack.hdskins.HDSkinManager;
 import com.voxelmodpack.hdskins.LiteModHDSkins;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 
 public class HDSkinsConfigPanel extends SettingsPanel {
     @Override

src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java

@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.voxelmodpack.hdskins.gui.GLWindow;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;

src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java

@@ -4,7 +4,7 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.INetworkPlayerInfo;
+import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;

src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.cache.CacheLoader;
 import com.google.common.util.concurrent.ListenableFuture;

src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java

@@ -1,7 +1,8 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
+
+import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
 
-import com.voxelmodpack.hdskins.DynamicTextureImage;
-import com.voxelmodpack.hdskins.ImageBufferDownloadHD;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.util.ResourceLocation;

src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java

@@ -1,7 +1,10 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.renderer.texture.TextureManager;

src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.client.renderer.IImageBuffer;
 import net.minecraft.client.renderer.ThreadDownloadImageData;

src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java

@@ -1,8 +1,11 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.collect.Maps;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
+import com.voxelmodpack.hdskins.resources.texture.ISkinAvailableCallback;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.util.ResourceLocation;
 

src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.util.ResourceLocation;
 

src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;

src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.ITextureObject;

src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java

@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.resources;
 
 import mcp.MethodsReturnNonnullByDefault;
 

src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import net.minecraft.client.renderer.texture.DynamicTexture;
 

src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;

src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import net.minecraft.client.renderer.IImageBuffer;
 

src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java

@@ -1,6 +1,7 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.voxelmodpack.hdskins.HDSkinManager;
 
 import javax.annotation.Nullable;
 import java.awt.Graphics;

src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import net.minecraft.client.renderer.IImageBuffer;

src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;

src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;

src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -27,7 +27,8 @@ public interface SkinServer extends Exposable {
 
     List<SkinServer> defaultServers = Lists.newArrayList(new LegacySkinServer(
             "http://skins.voxelmodpack.com",
-            "http://skinmanager.voxelmodpack.com"));
+            "http://skinmanager.voxelmodpack.com")
+    );
 
     MinecraftTexturesPayload loadProfileData(GameProfile profile) throws IOException;
 
@@ -41,7 +42,7 @@ public interface SkinServer extends Exposable {
         return true;
     }
 
-    public static void verifyServerConnection(Session session, String serverId) throws AuthenticationException {
+    static void verifyServerConnection(Session session, String serverId) throws AuthenticationException {
         MinecraftSessionService service = Minecraft.getMinecraft().getSessionService();
         service.joinServer(session.getProfile(), session.getToken(), serverId);
     }

src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;

src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 

src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.MoreObjects;
 

src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.Preconditions;
 import com.google.gson.JsonObject;

src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java

@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import mcp.MethodsReturnNonnullByDefault;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.gui;
+package com.voxelmodpack.hdskins.upload;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;

src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import org.lwjgl.opengl.Display;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java

@@ -1,7 +1,6 @@
-package com.voxelmodpack.hdskins.gui;
+package com.voxelmodpack.hdskins.upload;
 
 import com.google.common.collect.Lists;
-import com.voxelmodpack.hdskins.upload.awt.FileDropper;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.DefaultResourcePack;

src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java

@@ -1,7 +1,8 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import java.io.File;
 
+@FunctionalInterface
 public interface IFileCallback {
     void onDialogClosed(File file, int dialogResults);
 }

src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 public interface IFileDialog extends Runnable {
     void start();

src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java

@@ -1,12 +1,10 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import javax.swing.JFrame;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.voxelmodpack.hdskins.gui.GLWindow;
-
 final class InternalDialog {
 
     private static final Logger LOGGER = LogManager.getLogger();

src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 

src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java

@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.upload;
 
 import mcp.MethodsReturnNonnullByDefault;
 

src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java

@@ -1,7 +1,8 @@
 package com.voxelmodpack.hdskins.util;
 
 import com.google.common.io.CharStreams;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;

src/main/java/com/minelittlepony/MineLittlePony.java

@@ -7,9 +7,10 @@ import com.minelittlepony.pony.data.PonyDataSerialiser;
 import com.minelittlepony.render.skull.PonySkullRenderer;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.skins.LegacySkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.ValhallaSkinServer;
+import com.voxelmodpack.hdskins.server.LegacySkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.IReloadableResourceManager;

src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java

@@ -3,6 +3,7 @@ package com.minelittlepony.hdskins.gui;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
+
 import net.minecraft.util.ResourceLocation;
 
 /**

src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java

@@ -9,7 +9,8 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
 import com.voxelmodpack.hdskins.gui.GuiSkins;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+
 import net.minecraft.init.Items;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;

src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java

@@ -1,10 +1,11 @@
 package com.minelittlepony.mixin;
 
-import com.voxelmodpack.hdskins.IBufferedTexture;
 import net.minecraft.client.renderer.ThreadDownloadImageData;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture;
+
 import java.awt.image.BufferedImage;
 
 @Mixin(ThreadDownloadImageData.class)

src/main/java/com/minelittlepony/pony/data/Pony.java

@@ -3,7 +3,8 @@ package com.minelittlepony.pony.data;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.minelittlepony.MineLittlePony;
-import com.voxelmodpack.hdskins.IBufferedTexture;
+import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.ITextureObject;