From 0393945904727fbfecc0ca32380f7ae0b5b7d9fa Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 15 Jul 2018 00:18:53 +0200 Subject: [PATCH] Shuffle packages around to make more sense (and so I can find things) --- .../com/voxelmodpack/hdskins/HDSkinManager.java | 15 ++++++++------- .../hdskins/gui/EntityPlayerModel.java | 1 + .../com/voxelmodpack/hdskins/gui/GLWindow.java | 2 +- .../com/voxelmodpack/hdskins/gui/GuiSkins.java | 8 +++++--- .../hdskins/mod/LiteModHDSkinsMod.java | 5 +++-- .../{resource => resources}/ImageLoader.java | 2 +- .../hdskins/{resource => resources}/SkinData.java | 5 ++--- .../SkinResourceManager.java | 2 +- .../{upload/awt => resources}/package-info.java | 2 +- .../{skins => server}/BethlehemSkinServer.java | 6 +++++- .../{skins => server}/LegacySkinServer.java | 7 +++++-- .../hdskins/{skins => server}/ServerType.java | 2 +- .../hdskins/{skins => server}/SkinServer.java | 2 +- .../{skins => server}/SkinServerSerializer.java | 2 +- .../{skins => server}/SkinUploadResponse.java | 2 +- .../{skins => server}/TexturesPayloadBuilder.java | 3 ++- .../{skins => server}/ValhallaSkinServer.java | 5 ++++- .../{resource => server}/package-info.java | 2 +- .../hdskins/{gui => upload}/FileDropListener.java | 2 +- .../hdskins/upload/{awt => }/FileDropper.java | 2 +- .../upload/{awt => }/IOpenFileCallback.java | 2 +- .../hdskins/upload/{awt => }/InternalDialog.java | 2 +- .../hdskins/upload/{awt => }/ThreadOpenFile.java | 2 +- .../upload/{awt => }/ThreadOpenFilePNG.java | 2 +- .../hdskins/{skins => util}/AsyncCacheLoader.java | 2 +- .../hdskins/{skins => util}/CallableFutures.java | 2 +- .../{skins => util}/IndentedToStringStyle.java | 2 +- .../voxelmodpack/hdskins/{ => util}/Later.java | 2 +- .../hdskins/{skins => util}/NetClient.java | 2 +- .../ThreadMultipartPostUpload.java | 2 +- .../hdskins/{skins => util}/package-info.java | 2 +- .../java/com/minelittlepony/MineLittlePony.java | 5 +++-- 32 files changed, 60 insertions(+), 44 deletions(-) rename src/hdskins/java/com/voxelmodpack/hdskins/{resource => resources}/ImageLoader.java (97%) rename src/hdskins/java/com/voxelmodpack/hdskins/{resource => resources}/SkinData.java (89%) rename src/hdskins/java/com/voxelmodpack/hdskins/{resource => resources}/SkinResourceManager.java (99%) rename src/hdskins/java/com/voxelmodpack/hdskins/{upload/awt => resources}/package-info.java (78%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/BethlehemSkinServer.java (93%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/LegacySkinServer.java (96%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/ServerType.java (87%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/SkinServer.java (97%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/SkinServerSerializer.java (96%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/SkinUploadResponse.java (93%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/TexturesPayloadBuilder.java (96%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => server}/ValhallaSkinServer.java (98%) rename src/hdskins/java/com/voxelmodpack/hdskins/{resource => server}/package-info.java (78%) rename src/hdskins/java/com/voxelmodpack/hdskins/{gui => upload}/FileDropListener.java (96%) rename src/hdskins/java/com/voxelmodpack/hdskins/upload/{awt => }/FileDropper.java (97%) rename src/hdskins/java/com/voxelmodpack/hdskins/upload/{awt => }/IOpenFileCallback.java (89%) rename src/hdskins/java/com/voxelmodpack/hdskins/upload/{awt => }/InternalDialog.java (95%) rename src/hdskins/java/com/voxelmodpack/hdskins/upload/{awt => }/ThreadOpenFile.java (97%) rename src/hdskins/java/com/voxelmodpack/hdskins/upload/{awt => }/ThreadOpenFilePNG.java (95%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/AsyncCacheLoader.java (96%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/CallableFutures.java (94%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/IndentedToStringStyle.java (93%) rename src/hdskins/java/com/voxelmodpack/hdskins/{ => util}/Later.java (94%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/NetClient.java (98%) rename src/hdskins/java/com/voxelmodpack/hdskins/{upload => util}/ThreadMultipartPostUpload.java (98%) rename src/hdskins/java/com/voxelmodpack/hdskins/{skins => util}/package-info.java (80%) diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java index bf36474a..b200c3ef 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java +++ b/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.skins.AsyncCacheLoader; -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.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.AsyncCacheLoader; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.ITextureObject; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java index c9a05669..54ed4216 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java index b62d6e83..b8980117 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java index 103454ee..281fd7f3 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java +++ b/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.skins.SkinUploadResponse; -import com.voxelmodpack.hdskins.upload.awt.ThreadOpenFilePNG; +import com.voxelmodpack.hdskins.server.SkinServer; +import com.voxelmodpack.hdskins.server.SkinUploadResponse; +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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java b/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java index 21986d22..cc4fae70 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java +++ b/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.skins.SkinServerSerializer; +import com.voxelmodpack.hdskins.server.SkinServer; +import com.voxelmodpack.hdskins.server.SkinServerSerializer; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.resources.IReloadableResourceManager; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java index 6a4ff50f..8e24cf4b 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java index 59f46576..58c78932 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java +++ b/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 skins; } @@ -21,4 +20,4 @@ class Skin { public ResourceLocation getTexture() { return new ResourceLocation("hdskins", String.format("textures/skins/%s.png", skin)); } -} +} \ No newline at end of file diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java index d02b22df..d894617f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java similarity index 78% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java index c590c3dc..a8901f0a 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java index 940be824..cd6f486f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java +++ b/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") diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java index afbdfcf1..bff36e24 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java similarity index 87% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java index 3f7df569..4c60eb7c 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java index dce9d855..7c097df8 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java index f4992bed..01779cbf 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java index 680d915e..23fcabc8 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/TexturesPayloadBuilder.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/TexturesPayloadBuilder.java index 0e284663..d6142ade 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/TexturesPayloadBuilder.java +++ b/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 { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java index 81637d1e..9cbb6268 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java similarity index 78% rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java rename to src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java index e3758569..997d41b5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java index 0aac1ef4..d6b2a84e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java index 7bd7d65a..56d273db 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IOpenFileCallback.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/IOpenFileCallback.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IOpenFileCallback.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/IOpenFileCallback.java index 2f859b6f..f35f2641 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IOpenFileCallback.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java index 58d0ec05..5a605211 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java index 51502a90..409785d6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java index 2f15a7c1..13f941bd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/AsyncCacheLoader.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/AsyncCacheLoader.java index e7547ad5..0b252819 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/CallableFutures.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/CallableFutures.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java index 53f087a2..190ed407 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 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/IndentedToStringStyle.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java index 44255b78..9eb63e3c 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.ToStringStyle; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/Later.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/Later.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/Later.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/Later.java index 2e979663..33b885a9 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/Later.java +++ b/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 { 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 0e91c50d..d3eac7a9 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 java.io.BufferedReader; import java.io.File; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/ThreadMultipartPostUpload.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/ThreadMultipartPostUpload.java index f4030860..f4fc19c0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java +++ b/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; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/package-info.java similarity index 80% rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java rename to src/hdskins/java/com/voxelmodpack/hdskins/util/package-info.java index 4232b554..ef9b709f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java +++ b/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; diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java index a112e01f..0a8366cc 100644 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ b/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.skins.SkinServer; +import com.voxelmodpack.hdskins.server.LegacySkinServer; +import com.voxelmodpack.hdskins.server.SkinServer; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.IReloadableResourceManager;