move models to the model package

src/main/java/cc/fascinated/controller/PlayerController.java

@@ -1,8 +1,8 @@
 package cc.fascinated.controller;
 
-import cc.fascinated.service.player.model.Player;
+import cc.fascinated.model.player.Player;
-import cc.fascinated.service.player.model.Skin;
+import cc.fascinated.model.player.Skin;
-import cc.fascinated.service.player.PlayerService;
+import cc.fascinated.service.PlayerService;
 import cc.fascinated.util.PlayerUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.CacheControl;

src/main/java/cc/fascinated/model/mojang/MojangProfile.java

@@ -1,8 +1,8 @@
-package cc.fascinated.service.mojang.model;
+package cc.fascinated.model.mojang;
 
 import cc.fascinated.Main;
-import cc.fascinated.service.player.model.Cape;
+import cc.fascinated.model.player.Cape;
-import cc.fascinated.service.player.model.Skin;
+import cc.fascinated.model.player.Skin;
 import cc.fascinated.util.Tuple;
 import cc.fascinated.util.UUIDUtils;
 import com.google.gson.JsonObject;
@@ -16,6 +16,7 @@ import java.util.List;
 
 @Getter @NoArgsConstructor
 public class MojangProfile {
+
     /**
      * The UUID of the player.
      */

src/main/java/cc/fascinated/model/mojang/MojangUsernameToUuid.java

@@ -1,4 +1,4 @@
-package cc.fascinated.service.mojang.model;
+package cc.fascinated.model.mojang;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cc/fascinated/model/player/Cape.java

@@ -1,4 +1,4 @@
-package cc.fascinated.service.player.model;
+package cc.fascinated.model.player;
 
 import com.google.gson.JsonObject;
 import lombok.AllArgsConstructor;

src/main/java/cc/fascinated/model/player/Player.java

@@ -1,6 +1,6 @@
-package cc.fascinated.service.player.model;
+package cc.fascinated.model.player;
 
-import cc.fascinated.service.mojang.model.MojangProfile;
+import cc.fascinated.model.mojang.MojangProfile;
 import cc.fascinated.util.Tuple;
 import cc.fascinated.util.UUIDUtils;
 import lombok.Getter;

src/main/java/cc/fascinated/model/player/Skin.java

@@ -1,4 +1,4 @@
-package cc.fascinated.service.player.model;
+package cc.fascinated.model.player;
 
 import cc.fascinated.config.Config;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/cc/fascinated/service/MojangAPIService.java

@@ -1,7 +1,7 @@
-package cc.fascinated.service.mojang;
+package cc.fascinated.service;
 
-import cc.fascinated.service.mojang.model.MojangProfile;
+import cc.fascinated.model.mojang.MojangProfile;
-import cc.fascinated.service.mojang.model.MojangUsernameToUuid;
+import cc.fascinated.model.mojang.MojangUsernameToUuid;
 import cc.fascinated.util.WebRequest;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/cc/fascinated/service/PlayerService.java

@@ -1,9 +1,8 @@
-package cc.fascinated.service.player;
+package cc.fascinated.service;
 
-import cc.fascinated.service.player.model.Player;
+import cc.fascinated.model.player.Player;
-import cc.fascinated.service.mojang.MojangAPIService;
+import cc.fascinated.model.mojang.MojangProfile;
-import cc.fascinated.service.mojang.model.MojangProfile;
+import cc.fascinated.model.mojang.MojangUsernameToUuid;
-import cc.fascinated.service.mojang.model.MojangUsernameToUuid;
 import cc.fascinated.util.UUIDUtils;
 import lombok.extern.log4j.Log4j2;
 import net.jodah.expiringmap.ExpirationPolicy;

src/main/java/cc/fascinated/util/PlayerUtils.java

@@ -1,7 +1,7 @@
 package cc.fascinated.util;
 
 import cc.fascinated.Main;
-import cc.fascinated.service.player.model.Skin;
+import cc.fascinated.model.player.Skin;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;