From 1773ec7d9c01c33a072e67b4f9aa47bf3102d67c Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Mon, 8 Apr 2024 06:21:53 +0100
Subject: [PATCH] cleanup

---
 .../java/cc/fascinated/controller/PlayerController.java     | 6 +++---
 .../cc/fascinated/service/mojang/model/MojangProfile.java   | 4 ++--
 .../cc/fascinated/service/{ => player}/PlayerService.java   | 4 ++--
 .../{model/player => service/player/model}/Cape.java        | 2 +-
 .../{model/player => service/player/model}/Player.java      | 2 +-
 .../{model/player => service/player/model}/Skin.java        | 5 ++++-
 src/main/java/cc/fascinated/util/PlayerUtils.java           | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)
 rename src/main/java/cc/fascinated/service/{ => player}/PlayerService.java (97%)
 rename src/main/java/cc/fascinated/{model/player => service/player/model}/Cape.java (92%)
 rename src/main/java/cc/fascinated/{model/player => service/player/model}/Player.java (95%)
 rename src/main/java/cc/fascinated/{model/player => service/player/model}/Skin.java (97%)

diff --git a/src/main/java/cc/fascinated/controller/PlayerController.java b/src/main/java/cc/fascinated/controller/PlayerController.java
index 4628401..14434e1 100644
--- a/src/main/java/cc/fascinated/controller/PlayerController.java
+++ b/src/main/java/cc/fascinated/controller/PlayerController.java
@@ -1,8 +1,8 @@
 package cc.fascinated.controller;
 
-import cc.fascinated.model.player.Player;
-import cc.fascinated.model.player.Skin;
-import cc.fascinated.service.PlayerService;
+import cc.fascinated.service.player.model.Player;
+import cc.fascinated.service.player.model.Skin;
+import cc.fascinated.service.player.PlayerService;
 import cc.fascinated.util.PlayerUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.CacheControl;
diff --git a/src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java b/src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java
index 2de5443..845816b 100644
--- a/src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java
+++ b/src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java
@@ -1,8 +1,8 @@
 package cc.fascinated.service.mojang.model;
 
 import cc.fascinated.Main;
-import cc.fascinated.model.player.Cape;
-import cc.fascinated.model.player.Skin;
+import cc.fascinated.service.player.model.Cape;
+import cc.fascinated.service.player.model.Skin;
 import cc.fascinated.util.Tuple;
 import cc.fascinated.util.UUIDUtils;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/cc/fascinated/service/PlayerService.java b/src/main/java/cc/fascinated/service/player/PlayerService.java
similarity index 97%
rename from src/main/java/cc/fascinated/service/PlayerService.java
rename to src/main/java/cc/fascinated/service/player/PlayerService.java
index 8cb9a0d..92deb0a 100644
--- a/src/main/java/cc/fascinated/service/PlayerService.java
+++ b/src/main/java/cc/fascinated/service/player/PlayerService.java
@@ -1,6 +1,6 @@
-package cc.fascinated.service;
+package cc.fascinated.service.player;
 
-import cc.fascinated.model.player.Player;
+import cc.fascinated.service.player.model.Player;
 import cc.fascinated.service.mojang.MojangAPIService;
 import cc.fascinated.service.mojang.model.MojangProfile;
 import cc.fascinated.service.mojang.model.MojangUsernameToUuid;
diff --git a/src/main/java/cc/fascinated/model/player/Cape.java b/src/main/java/cc/fascinated/service/player/model/Cape.java
similarity index 92%
rename from src/main/java/cc/fascinated/model/player/Cape.java
rename to src/main/java/cc/fascinated/service/player/model/Cape.java
index cb26d0a..8980ff6 100644
--- a/src/main/java/cc/fascinated/model/player/Cape.java
+++ b/src/main/java/cc/fascinated/service/player/model/Cape.java
@@ -1,4 +1,4 @@
-package cc.fascinated.model.player;
+package cc.fascinated.service.player.model;
 
 import com.google.gson.JsonObject;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/cc/fascinated/model/player/Player.java b/src/main/java/cc/fascinated/service/player/model/Player.java
similarity index 95%
rename from src/main/java/cc/fascinated/model/player/Player.java
rename to src/main/java/cc/fascinated/service/player/model/Player.java
index 6c5d578..69ab788 100644
--- a/src/main/java/cc/fascinated/model/player/Player.java
+++ b/src/main/java/cc/fascinated/service/player/model/Player.java
@@ -1,4 +1,4 @@
-package cc.fascinated.model.player;
+package cc.fascinated.service.player.model;
 
 import cc.fascinated.service.mojang.model.MojangProfile;
 import cc.fascinated.util.Tuple;
diff --git a/src/main/java/cc/fascinated/model/player/Skin.java b/src/main/java/cc/fascinated/service/player/model/Skin.java
similarity index 97%
rename from src/main/java/cc/fascinated/model/player/Skin.java
rename to src/main/java/cc/fascinated/service/player/model/Skin.java
index df185b5..b928a08 100644
--- a/src/main/java/cc/fascinated/model/player/Skin.java
+++ b/src/main/java/cc/fascinated/service/player/model/Skin.java
@@ -1,4 +1,4 @@
-package cc.fascinated.model.player;
+package cc.fascinated.service.player.model;
 
 import cc.fascinated.config.Config;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,6 +28,9 @@ public class Skin {
      */
     private final Model model;
 
+    /**
+     * The part URLs of the skin
+     */
     @JsonProperty("parts")
     private final Map<String, String> partUrls = new HashMap<>();
 
diff --git a/src/main/java/cc/fascinated/util/PlayerUtils.java b/src/main/java/cc/fascinated/util/PlayerUtils.java
index d1e7071..bd5404d 100644
--- a/src/main/java/cc/fascinated/util/PlayerUtils.java
+++ b/src/main/java/cc/fascinated/util/PlayerUtils.java
@@ -1,7 +1,7 @@
 package cc.fascinated.util;
 
 import cc.fascinated.Main;
-import cc.fascinated.model.player.Skin;
+import cc.fascinated.service.player.model.Skin;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;