From 0cd8db32fd84695be29bdf202c48c82e6e1f088b Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Mon, 8 Apr 2024 06:28:43 +0100
Subject: [PATCH] move models to the model package

---
 .../fascinated/controller/PlayerController.java  |   6 +++---
 .../model => model/mojang}/MojangProfile.java    |   7 ++++---
 .../mojang}/MojangUsernameToUuid.java            |   2 +-
 .../player/model => model/player}/Cape.java      |   2 +-
 .../player/model => model/player}/Player.java    |   4 ++--
 .../player/model => model/player}/Skin.java      |   2 +-
 .../service/{mojang => }/MojangAPIService.java   |   6 +++---
 .../service/{player => }/PlayerService.java      |   9 ++++-----
 .../java/cc/fascinated/util/PlayerUtils.java     |   2 +-
 src/main/resources/images/default_head.png       | Bin 1197 -> 0 bytes
 10 files changed, 20 insertions(+), 20 deletions(-)
 rename src/main/java/cc/fascinated/{service/mojang/model => model/mojang}/MojangProfile.java (95%)
 rename src/main/java/cc/fascinated/{service/mojang/model => model/mojang}/MojangUsernameToUuid.java (91%)
 rename src/main/java/cc/fascinated/{service/player/model => model/player}/Cape.java (92%)
 rename src/main/java/cc/fascinated/{service/player/model => model/player}/Player.java (90%)
 rename src/main/java/cc/fascinated/{service/player/model => model/player}/Skin.java (98%)
 rename src/main/java/cc/fascinated/service/{mojang => }/MojangAPIService.java (87%)
 rename src/main/java/cc/fascinated/service/{player => }/PlayerService.java (91%)
 delete mode 100644 src/main/resources/images/default_head.png

diff --git a/src/main/java/cc/fascinated/controller/PlayerController.java b/src/main/java/cc/fascinated/controller/PlayerController.java
index 14434e1..4628401 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.service.player.model.Player;
-import cc.fascinated.service.player.model.Skin;
-import cc.fascinated.service.player.PlayerService;
+import cc.fascinated.model.player.Player;
+import cc.fascinated.model.player.Skin;
+import cc.fascinated.service.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/model/mojang/MojangProfile.java
similarity index 95%
rename from src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java
rename to src/main/java/cc/fascinated/model/mojang/MojangProfile.java
index 845816b..31cb61d 100644
--- a/src/main/java/cc/fascinated/service/mojang/model/MojangProfile.java
+++ b/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.service.player.model.Skin;
+import cc.fascinated.model.player.Cape;
+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.
      */
diff --git a/src/main/java/cc/fascinated/service/mojang/model/MojangUsernameToUuid.java b/src/main/java/cc/fascinated/model/mojang/MojangUsernameToUuid.java
similarity index 91%
rename from src/main/java/cc/fascinated/service/mojang/model/MojangUsernameToUuid.java
rename to src/main/java/cc/fascinated/model/mojang/MojangUsernameToUuid.java
index 45f2278..a8a2c0d 100644
--- a/src/main/java/cc/fascinated/service/mojang/model/MojangUsernameToUuid.java
+++ b/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;
diff --git a/src/main/java/cc/fascinated/service/player/model/Cape.java b/src/main/java/cc/fascinated/model/player/Cape.java
similarity index 92%
rename from src/main/java/cc/fascinated/service/player/model/Cape.java
rename to src/main/java/cc/fascinated/model/player/Cape.java
index 8980ff6..cb26d0a 100644
--- a/src/main/java/cc/fascinated/service/player/model/Cape.java
+++ b/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;
diff --git a/src/main/java/cc/fascinated/service/player/model/Player.java b/src/main/java/cc/fascinated/model/player/Player.java
similarity index 90%
rename from src/main/java/cc/fascinated/service/player/model/Player.java
rename to src/main/java/cc/fascinated/model/player/Player.java
index 69ab788..c150180 100644
--- a/src/main/java/cc/fascinated/service/player/model/Player.java
+++ b/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;
diff --git a/src/main/java/cc/fascinated/service/player/model/Skin.java b/src/main/java/cc/fascinated/model/player/Skin.java
similarity index 98%
rename from src/main/java/cc/fascinated/service/player/model/Skin.java
rename to src/main/java/cc/fascinated/model/player/Skin.java
index b928a08..c2ea590 100644
--- a/src/main/java/cc/fascinated/service/player/model/Skin.java
+++ b/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;
diff --git a/src/main/java/cc/fascinated/service/mojang/MojangAPIService.java b/src/main/java/cc/fascinated/service/MojangAPIService.java
similarity index 87%
rename from src/main/java/cc/fascinated/service/mojang/MojangAPIService.java
rename to src/main/java/cc/fascinated/service/MojangAPIService.java
index 6a57883..4fe8cfa 100644
--- a/src/main/java/cc/fascinated/service/mojang/MojangAPIService.java
+++ b/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.service.mojang.model.MojangUsernameToUuid;
+import cc.fascinated.model.mojang.MojangProfile;
+import cc.fascinated.model.mojang.MojangUsernameToUuid;
 import cc.fascinated.util.WebRequest;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/cc/fascinated/service/player/PlayerService.java b/src/main/java/cc/fascinated/service/PlayerService.java
similarity index 91%
rename from src/main/java/cc/fascinated/service/player/PlayerService.java
rename to src/main/java/cc/fascinated/service/PlayerService.java
index 92deb0a..fd461dc 100644
--- a/src/main/java/cc/fascinated/service/player/PlayerService.java
+++ b/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.service.mojang.MojangAPIService;
-import cc.fascinated.service.mojang.model.MojangProfile;
-import cc.fascinated.service.mojang.model.MojangUsernameToUuid;
+import cc.fascinated.model.player.Player;
+import cc.fascinated.model.mojang.MojangProfile;
+import cc.fascinated.model.mojang.MojangUsernameToUuid;
 import cc.fascinated.util.UUIDUtils;
 import lombok.extern.log4j.Log4j2;
 import net.jodah.expiringmap.ExpirationPolicy;
diff --git a/src/main/java/cc/fascinated/util/PlayerUtils.java b/src/main/java/cc/fascinated/util/PlayerUtils.java
index bd5404d..d1e7071 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.service.player.model.Skin;
+import cc.fascinated.model.player.Skin;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
diff --git a/src/main/resources/images/default_head.png b/src/main/resources/images/default_head.png
deleted file mode 100644
index 32b3889493593ffca10492e3ec46002a7b5d2df7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1197
zcmV;e1XBBnP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(XGugsRCr$PmrZC~RTRhn_ult0)0rd_J0@yVqM;hCXem`(#7$QfDo918et;l?
z3m5JUxD$kSA-WaZiBPB%Hztb;LUzTXF2okCX@Xd7oP5k==6&3I<=i(jO(e~%>b)uV
zZ06%V-Z|%Y{^y+g7zWs56ID&Oq*;bA48gkJ0gbE^;FV_%6;GfG=FaVQcK%1Y;;an}
zjsT=tib`BENn}bH7=>w^I`Sx5$<B|d#K7749|rocNoQbi1R&(x#MsU<1VU^90Gv89
zZ2-(KZ9s2P!IPoDp~*7#yaJ}iBVCP4{mMsSXp|mtZvK1z@D!Q}!`#xwwnCmbID|^9
z_dWnp0419$g<MLLWH}7`?Qrt&lu^LW0Pd0&pltt}JPo}}D(nv6E>Qp_PgPH)gj5R2
zCPQr`FfC9304DZ_SYF9-V1Hm1LZev>$~`{=s0FmvCh@IC!;p*s>}Jjbn0}yawm0R+
zI0I)4<v2iAv^zK?as>p8Bau0>TtaY;Fc4-K3SNK+g+@D(P+Eh4nZ=<2-n~w%lLjbR
zZ;fUhf$M9V12@r~T$8L1pnHgkf&fw~aKTWD0(8>6@1K5;L<|xFE6oJClBkp-bB|Km
zfJyV>e%?)s08qk}IPMS5TjvPi*BiGvMBK@&w>+CYesD;qsRVeD0OuT1O5{=_4Cpt*
znRnkr97ZUYhS6@VQ`yn@^ACLV)i-FhQ)Ib9AQ*%YP)Zf;q8Oq`7)9)Mj<61Z6ri<0
z6p&&Wa+#aYPzZ=XVD|Nwu`iCXnIsS*Mq|B!$?-8PE?zMb|8#BvGMC7t1cOE(0x%7v
zQiCx9sZ8~IC&*qK^j7Q7%S|_0z{~+%RR8VcM^Ud-@cF`Jy#L0lI63<XPRx9P_l|#u
zXt;ti7mi_W;WeE5;2nH??mXU_If}nqEqwOvWupSlZVgOo0a5?~*y$YM0DzJ<Z!%gy
zNrfnmar&uA+%r_ede%X`JcRN4CJ@9me0}kv>7JLKdlt*ruj02GD=5VwhQkv6*;vJw
zmwrc@rlyU+iYeL~f|NXsnSI?sNY@C8bpSL2NcJHQ@bn`OVP^V4$fSjvYpZB%WH>Nh
zN5mu+ms;D#()|-<thF*Uo0}M|hN#zS5OEa?zg)wmE7y>!+_Zy&MxNjP9AO>6hc6y8
z^Pdv9xw?w6dL3yeK{HM9SEGqcNu!K<ZNvabvJ~a+n_)ZYfClK;Xa)C<3`1%SB^kKT
zP<d{iM@EOD3qM`m2JnR^9>!=j!0h?&?aqMzY1=sK#wvXmsCWP_RKaEpUI8}gyWra^
zz=bN<jKM3wCVdxtdj+^q1)DK=1=ytTf^V+?7ph=02Co2{^j+}n72rY@Y{uXfV3WQJ
zzP$omsDjNHyaH^}cfq$;fD2Wy8G~1VP5LhQ_6l&J3N~Z#3b0Av1>ar)E>yv03|;{?
z>AT?DE5L;+*o?s|z$Sece0v4BPz9SYcm>#`?}Bfy02iuYGlqWw!iM2c_tWYr00000
LNkvXXu0mjf`z9WF