Shuffle packages around to make more sense (and so I can find things)

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

@@ -22,13 +22,14 @@ import com.mojang.util.UUIDTypeAdapter;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.voxelmodpack.hdskins.gui.GuiSkins;
-import com.voxelmodpack.hdskins.resource.SkinResourceManager;
+import com.voxelmodpack.hdskins.resources.SkinResourceManager;
-import com.voxelmodpack.hdskins.skins.AsyncCacheLoader;
+import com.voxelmodpack.hdskins.server.BethlehemSkinServer;
-import com.voxelmodpack.hdskins.skins.BethlehemSkinServer;
+import com.voxelmodpack.hdskins.server.LegacySkinServer;
-import com.voxelmodpack.hdskins.skins.LegacySkinServer;
+import com.voxelmodpack.hdskins.server.ServerType;
-import com.voxelmodpack.hdskins.skins.ServerType;
+import com.voxelmodpack.hdskins.server.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
-import com.voxelmodpack.hdskins.skins.ValhallaSkinServer;
+import com.voxelmodpack.hdskins.util.AsyncCacheLoader;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.IImageBuffer;
 import net.minecraft.client.renderer.texture.ITextureObject;

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

@@ -9,6 +9,7 @@ import com.voxelmodpack.hdskins.HDSkinManager;
 import com.voxelmodpack.hdskins.ImageBufferDownloadHD;
 import com.voxelmodpack.hdskins.PreviewTexture;
 import com.voxelmodpack.hdskins.PreviewTextureManager;
+
 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/gui/GLWindow.java

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

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

@@ -10,9 +10,11 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinUploadResponse;
+import com.voxelmodpack.hdskins.server.SkinUploadResponse;
-import com.voxelmodpack.hdskins.upload.awt.ThreadOpenFilePNG;
+import com.voxelmodpack.hdskins.upload.FileDropListener;
+import com.voxelmodpack.hdskins.upload.ThreadOpenFilePNG;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiButton;

src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java

@@ -13,8 +13,9 @@ 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.server.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServerSerializer;
+import com.voxelmodpack.hdskins.server.SkinServerSerializer;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.resources.IReloadableResourceManager;

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
 
 import com.voxelmodpack.hdskins.DynamicTextureImage;
 import com.voxelmodpack.hdskins.ImageBufferDownloadHD;

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;
 
@@ -7,7 +7,6 @@ import java.util.UUID;
 
 @SuppressWarnings("unused")
 class SkinData {
-
     List<Skin> skins;
 }
 
@@ -21,4 +20,4 @@ class Skin {
     public ResourceLocation getTexture() {
         return new ResourceLocation("hdskins", String.format("textures/skins/%s.png", skin));
     }
-}
+}

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/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/server/BethlehemSkinServer.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import java.net.URI;
 import java.util.Locale;
@@ -16,6 +16,10 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mojang.util.UUIDTypeAdapter;
 import com.voxelmodpack.hdskins.HDSkinManager;
+import com.voxelmodpack.hdskins.util.CallableFutures;
+import com.voxelmodpack.hdskins.util.IndentedToStringStyle;
+import com.voxelmodpack.hdskins.util.NetClient;
+
 import net.minecraft.util.Session;
 
 @ServerType("bethlehem")

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;
@@ -8,7 +8,10 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mojang.util.UUIDTypeAdapter;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.upload.ThreadMultipartPostUpload;
+import com.voxelmodpack.hdskins.util.CallableFutures;
+import com.voxelmodpack.hdskins.util.IndentedToStringStyle;
+import com.voxelmodpack.hdskins.util.ThreadMultipartPostUpload;
+
 import net.minecraft.util.Session;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.logging.log4j.LogManager;

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;

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/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/TexturesPayloadBuilder.java

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -17,6 +17,7 @@ import java.util.UUID;
  * required because it has no useful constructor. This uses reflection
  * via Gson to create a new instance and populate the fields.
  */
+@Deprecated
 @SuppressWarnings("unused")
 public class TexturesPayloadBuilder {
 

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;
@@ -9,6 +9,9 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mojang.util.UUIDTypeAdapter;
 import com.voxelmodpack.hdskins.HDSkinManager;
+import com.voxelmodpack.hdskins.util.CallableFutures;
+import com.voxelmodpack.hdskins.util.IndentedToStringStyle;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
 import org.apache.commons.lang3.builder.ToStringBuilder;

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

@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.resource;
+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 java.awt.Color;
 import java.awt.dnd.DropTarget;

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import javax.swing.JFileChooser;
 

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import javax.swing.JFrame;
 

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/util/AsyncCacheLoader.java

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

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.util;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.util;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.commons.lang3.builder.ToStringStyle;

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.util;
 
 public final class Later extends Thread {
 

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.util;
 
 import java.io.BufferedReader;
 import java.io.File;

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

@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload;
+package com.voxelmodpack.hdskins.util;
 
 import org.apache.commons.io.IOUtils;
 

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

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

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

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