move skin related classes to skin package

build.gradle

@@ -21,8 +21,6 @@ forgix {
     // forgix does not append .jar extension for some reason
     mergedJarName = "${project.archives_name}-${project.version}.jar"
     outputDir = "build/libs/merged"
-
-//    removeDuplicate "$project.maven_group.$project.mod_id"
 }
 
 allprojects {

common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java

@@ -5,6 +5,9 @@ import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import it.unimi.dsi.fastutil.Pair;
+import net.lionarius.skinrestorer.skin.SkinIO;
+import net.lionarius.skinrestorer.skin.SkinResult;
+import net.lionarius.skinrestorer.skin.SkinStorage;
 import net.minecraft.network.packet.s2c.play.*;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
@@ -22,14 +25,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 public class SkinRestorer {
+    public static final String MOD_ID = "skinrestorer";
+    public static final Logger LOGGER = LoggerFactory.getLogger("SkinRestorer");
     
     private static SkinStorage skinStorage;
     private static Path configDir;
     
-    public static final String MOD_ID = "skinrestorer";
-    
-    public static final Logger LOGGER = LoggerFactory.getLogger("SkinRestorer");
-    
     public static SkinStorage getSkinStorage() {
         return skinStorage;
     }

common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java

@@ -3,11 +3,11 @@ package net.lionarius.skinrestorer.command;
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
-import net.lionarius.skinrestorer.MineskinSkinProvider;
+import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
-import net.lionarius.skinrestorer.MojangSkinProvider;
+import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.SkinResult;
+import net.lionarius.skinrestorer.skin.SkinResult;
-import net.lionarius.skinrestorer.enums.SkinVariant;
+import net.lionarius.skinrestorer.skin.SkinVariant;
 import net.lionarius.skinrestorer.util.TranslationUtils;
 import net.minecraft.command.argument.GameProfileArgumentType;
 import net.minecraft.server.command.ServerCommandSource;

common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerManagerMixin.java

@@ -1,7 +1,7 @@
 package net.lionarius.skinrestorer.mixin;
 
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.SkinResult;
+import net.lionarius.skinrestorer.skin.SkinResult;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;

common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginNetworkHandlerMixin.java

@@ -1,9 +1,9 @@
 package net.lionarius.skinrestorer.mixin;
 
 import com.mojang.authlib.GameProfile;
-import net.lionarius.skinrestorer.MojangSkinProvider;
+import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.SkinResult;
+import net.lionarius.skinrestorer.skin.SkinResult;
 import net.minecraft.server.network.ServerLoginNetworkHandler;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java

@@ -1,4 +1,4 @@
-package net.lionarius.skinrestorer;
+package net.lionarius.skinrestorer.skin;
 
 import com.mojang.authlib.properties.Property;
 import net.lionarius.skinrestorer.util.FileUtils;

common/src/main/java/net/lionarius/skinrestorer/skin/SkinResult.java

@@ -1,4 +1,4 @@
-package net.lionarius.skinrestorer;
+package net.lionarius.skinrestorer.skin;
 
 import com.mojang.authlib.properties.Property;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java

@@ -1,4 +1,4 @@
-package net.lionarius.skinrestorer;
+package net.lionarius.skinrestorer.skin;
 
 import com.mojang.authlib.properties.Property;
 

common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java

@@ -1,4 +1,4 @@
-package net.lionarius.skinrestorer.enums;
+package net.lionarius.skinrestorer.skin;
 
 public enum SkinVariant {
     

common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java

@@ -1,8 +1,9 @@
-package net.lionarius.skinrestorer;
+package net.lionarius.skinrestorer.skin.provider;
 
 import com.google.gson.JsonObject;
 import com.mojang.authlib.properties.Property;
-import net.lionarius.skinrestorer.enums.SkinVariant;
+import net.lionarius.skinrestorer.skin.SkinVariant;
+import net.lionarius.skinrestorer.skin.SkinResult;
 import net.lionarius.skinrestorer.util.JsonUtils;
 import net.lionarius.skinrestorer.util.WebUtils;
 

common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java

@@ -1,7 +1,8 @@
-package net.lionarius.skinrestorer;
+package net.lionarius.skinrestorer.skin.provider;
 
 import com.google.gson.JsonObject;
 import com.mojang.authlib.properties.Property;
+import net.lionarius.skinrestorer.skin.SkinResult;
 import net.lionarius.skinrestorer.util.JsonUtils;
 import net.lionarius.skinrestorer.util.WebUtils;