From 8d2caccd0105d3d0286828589b07e6ae0bba91fc Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Mon, 3 Sep 2018 15:56:56 -0400
Subject: [PATCH] Move some more classes to util

---
 src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java    | 2 +-
 src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java   | 4 ++--
 .../com/voxelmodpack/hdskins/ThreadDownloadImageETag.java     | 2 +-
 src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java   | 2 +-
 .../com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java   | 4 ++++
 .../java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java | 4 ++++
 .../java/com/voxelmodpack/hdskins/skins/SkinServer.java       | 1 +
 .../com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java    | 3 +++
 .../voxelmodpack/hdskins/{skins => util}/CallableFutures.java | 2 +-
 .../hdskins/{skins => util}/IndentedToStringStyle.java        | 2 +-
 .../hdskins/{skins => util}/MoreHttpResponses.java            | 3 ++-
 .../com/voxelmodpack/hdskins/{skins => util}/NetClient.java   | 2 +-
 12 files changed, 22 insertions(+), 9 deletions(-)
 rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/CallableFutures.java (96%)
 rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/IndentedToStringStyle.java (96%)
 rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/MoreHttpResponses.java (96%)
 rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/NetClient.java (98%)

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
index d849d203..1b67a94c 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
@@ -1,6 +1,6 @@
 package com.voxelmodpack.hdskins;
 
-import com.voxelmodpack.hdskins.skins.MoreHttpResponses;
+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;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
index 01f0f863..675b80b9 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
@@ -14,8 +14,8 @@ 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.skins.MoreHttpResponses;
-import com.voxelmodpack.hdskins.skins.NetClient;
+import com.voxelmodpack.hdskins.util.MoreHttpResponses;
+import com.voxelmodpack.hdskins.util.NetClient;
 import com.voxelmodpack.hdskins.skins.SkinServer;
 import com.voxelmodpack.hdskins.skins.SkinUpload;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java
index f9c4df07..ea625641 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java
@@ -1,6 +1,6 @@
 package com.voxelmodpack.hdskins;
 
-import com.voxelmodpack.hdskins.skins.MoreHttpResponses;
+import com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import net.minecraft.client.renderer.IImageBuffer;
 import net.minecraft.client.renderer.texture.SimpleTexture;
 import net.minecraft.client.renderer.texture.TextureUtil;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index 4275ee29..b1627153 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -10,7 +10,7 @@ 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.skins.CallableFutures;
+import com.voxelmodpack.hdskins.util.CallableFutures;
 import com.voxelmodpack.hdskins.skins.SkinServer;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
index 696c17fa..f6837346 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
@@ -7,6 +7,10 @@ import com.mojang.authlib.GameProfile;
 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.MoreHttpResponses;
+import com.voxelmodpack.hdskins.util.NetClient;
 import net.minecraft.util.Session;
 
 import java.io.IOException;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
index 4ac06ee7..9d29020b 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
@@ -9,6 +9,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.util.CallableFutures;
+import com.voxelmodpack.hdskins.util.IndentedToStringStyle;
+import com.voxelmodpack.hdskins.util.MoreHttpResponses;
+import com.voxelmodpack.hdskins.util.NetClient;
 import com.voxelmodpack.hdskins.util.TexturesPayloadBuilder;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
index 65975f1a..db26139e 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
@@ -10,6 +10,7 @@ import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mojang.util.UUIDTypeAdapter;
 import com.mumfrey.liteloader.modconfig.Exposable;
 import com.voxelmodpack.hdskins.HDSkinManager;
+import com.voxelmodpack.hdskins.util.CallableFutures;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
index 4271d36f..6bba39aa 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
@@ -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 com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
 import org.apache.http.HttpHeaders;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/CallableFutures.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/CallableFutures.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java
index e8ae2a65..9afc4be3 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/CallableFutures.java
+++ b/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;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/IndentedToStringStyle.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/IndentedToStringStyle.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java
index 44d1d521..e3a584cb 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/IndentedToStringStyle.java
+++ b/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.ToStringBuilder;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/MoreHttpResponses.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/MoreHttpResponses.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
index 52a56b86..c342698d 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/MoreHttpResponses.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
@@ -1,6 +1,7 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.util;
 
 import com.google.common.io.CharStreams;
+import com.voxelmodpack.hdskins.skins.SkinServer;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java
similarity index 98%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java
index cc86dbfa..a479d198 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.util;
 
 import com.voxelmodpack.hdskins.HDSkinManager;
 import org.apache.http.HttpEntity;