From d59bff14c9bceb7cf9414b818e5af2351a777e82 Mon Sep 17 00:00:00 2001
From: lionarius <main@lionarius.ru>
Date: Thu, 27 Jun 2024 19:18:58 +0300
Subject: [PATCH] move skin related classes to skin package

---
 build.gradle                                             | 2 --
 .../java/net/lionarius/skinrestorer/SkinRestorer.java    | 9 +++++----
 .../net/lionarius/skinrestorer/command/SkinCommand.java  | 8 ++++----
 .../lionarius/skinrestorer/mixin/PlayerManagerMixin.java | 2 +-
 .../mixin/ServerLoginNetworkHandlerMixin.java            | 4 ++--
 .../net/lionarius/skinrestorer/{ => skin}/SkinIO.java    | 2 +-
 .../lionarius/skinrestorer/{ => skin}/SkinResult.java    | 2 +-
 .../lionarius/skinrestorer/{ => skin}/SkinStorage.java   | 2 +-
 .../skinrestorer/{enums => skin}/SkinVariant.java        | 2 +-
 .../{ => skin/provider}/MineskinSkinProvider.java        | 5 +++--
 .../{ => skin/provider}/MojangSkinProvider.java          | 3 ++-
 11 files changed, 21 insertions(+), 20 deletions(-)
 rename common/src/main/java/net/lionarius/skinrestorer/{ => skin}/SkinIO.java (95%)
 rename common/src/main/java/net/lionarius/skinrestorer/{ => skin}/SkinResult.java (96%)
 rename common/src/main/java/net/lionarius/skinrestorer/{ => skin}/SkinStorage.java (96%)
 rename common/src/main/java/net/lionarius/skinrestorer/{enums => skin}/SkinVariant.java (85%)
 rename common/src/main/java/net/lionarius/skinrestorer/{ => skin/provider}/MineskinSkinProvider.java (88%)
 rename common/src/main/java/net/lionarius/skinrestorer/{ => skin/provider}/MojangSkinProvider.java (93%)

diff --git a/build.gradle b/build.gradle
index 93f2c1b..59ff661 100644
--- a/build.gradle
+++ b/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 {
diff --git a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java b/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
index 2271525..2559a70 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
+++ b/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;
     }
diff --git a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
index eeb108d..aa299ce 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
+++ b/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.MojangSkinProvider;
+import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
+import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.SkinResult;
-import net.lionarius.skinrestorer.enums.SkinVariant;
+import net.lionarius.skinrestorer.skin.SkinResult;
+import net.lionarius.skinrestorer.skin.SkinVariant;
 import net.lionarius.skinrestorer.util.TranslationUtils;
 import net.minecraft.command.argument.GameProfileArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerManagerMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerManagerMixin.java
index 7567ea8..6f7c092 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerManagerMixin.java
+++ b/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;
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginNetworkHandlerMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginNetworkHandlerMixin.java
index 49c8871..d63db42 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginNetworkHandlerMixin.java
+++ b/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;
diff --git a/common/src/main/java/net/lionarius/skinrestorer/SkinIO.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java
similarity index 95%
rename from common/src/main/java/net/lionarius/skinrestorer/SkinIO.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java
index 0c7fa27..10887c7 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinIO.java
+++ b/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;
diff --git a/common/src/main/java/net/lionarius/skinrestorer/SkinResult.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinResult.java
similarity index 96%
rename from common/src/main/java/net/lionarius/skinrestorer/SkinResult.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/SkinResult.java
index a0c96d5..f544ec7 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinResult.java
+++ b/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;
diff --git a/common/src/main/java/net/lionarius/skinrestorer/SkinStorage.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
similarity index 96%
rename from common/src/main/java/net/lionarius/skinrestorer/SkinStorage.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
index 5c719d6..f1b0fff 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinStorage.java
+++ b/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;
 
diff --git a/common/src/main/java/net/lionarius/skinrestorer/enums/SkinVariant.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
similarity index 85%
rename from common/src/main/java/net/lionarius/skinrestorer/enums/SkinVariant.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
index 9d85775..d30d5a6 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/enums/SkinVariant.java
+++ b/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 {
     
diff --git a/common/src/main/java/net/lionarius/skinrestorer/MineskinSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
similarity index 88%
rename from common/src/main/java/net/lionarius/skinrestorer/MineskinSkinProvider.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
index df35974..6ba8a3f 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/MineskinSkinProvider.java
+++ b/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;
 
diff --git a/common/src/main/java/net/lionarius/skinrestorer/MojangSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
similarity index 93%
rename from common/src/main/java/net/lionarius/skinrestorer/MojangSkinProvider.java
rename to common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
index c73a95b..dfb1530 100644
--- a/common/src/main/java/net/lionarius/skinrestorer/MojangSkinProvider.java
+++ b/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;