From 709ad4fbf02c42c96c7d36c696e76fca95ff5548 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sun, 8 Mar 2026 12:07:23 +0100
Subject: [PATCH] ServiceClient cloak loading

---
 .../org/saturnclient/client/ServiceClient.java    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/client/ServiceClient.java
index d617b55..8b68069 100644
--- a/src/main/java/org/saturnclient/client/ServiceClient.java
+++ b/src/main/java/org/saturnclient/client/ServiceClient.java
@@ -1,13 +1,13 @@
 package org.saturnclient.client;
 
 import java.util.UUID;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.common.ref.game.MinecraftClientRef;
+import org.saturnclient.cosmetics.Cloaks;
+import org.saturnclient.cosmetics.Hats;
 
 import dev.selimaj.session.Session;
 
@@ -15,9 +15,6 @@ public class ServiceClient {
     private static Session session;
     public static UUID uuid;
 
-    public static final List<String> availableCloaks = new ArrayList<>();
-    public static final List<String> availableHats = new ArrayList<>();
-
     public static boolean connectTimeout() {
         try {
             session = Session.connect("wss://saturn-server.selimaj.dev", 10, TimeUnit.SECONDS);
@@ -61,11 +58,11 @@ public class ServiceClient {
                     .get();
 
             for (String availableCloak : response.cloaks()) {
-                availableCloaks.add(availableCloak);
+                Cloaks.availableCloaks.add(availableCloak);
             }
 
             for (String availableHat : response.hats()) {
-                availableHats.add(availableHat);
+                Hats.availableHats.add(availableHat);
             }
 
             eventHandlers();
@@ -123,7 +120,7 @@ public class ServiceClient {
                 if (throwable != null) {
                     throwable.printStackTrace();
                 } else {
-                    availableCloaks.add(itemId);
+                    Cloaks.availableCloaks.add(itemId);
                 }
             });
         } catch (Exception e) {
@@ -137,7 +134,7 @@ public class ServiceClient {
                 if (throwable != null) {
                     throwable.printStackTrace();
                 } else {
-                    availableHats.add(itemId);
+                    Hats.availableHats.add(itemId);
                 }
             });
         } catch (Exception e) {