From 8614e1bdd1176b8c52fd8eb8ae33a0809c44dc2d Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Mon, 23 Feb 2026 06:47:08 +0100
Subject: [PATCH] Working service system

---
 build.gradle                                  |  2 +-
 .../saturnclient/client/ServiceClient.java    | 36 +++++++++++++++----
 .../ui2/resources/SvgTexture.java             |  1 -
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2384564..8d5fc02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     // ─────────────────────────────────────────────
 
     // Session Java (auth/session handling)
-    implementation "com.github.selimaj-dev:session-java:0.1.4"
+    implementation "com.github.selimaj-dev:session-java:0.1.5"
 }
 
 
diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
index 8876664..4a9f364 100644
--- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
@@ -46,7 +46,7 @@ public class ServiceClient {
             uuid = mcSession.getUuidOrNull();
             String username = mcSession.getUsername();
 
-            SaturnClient.LOGGER.info("Authenticating with UUID: " + accessToken);
+            SaturnClient.LOGGER.info("Authenticating with UUID: " + uuid);
 
             if (!connectTimeout()) {
                 SaturnClient.LOGGER.error("Unable to authenticate: Session Server Timeout");
@@ -76,7 +76,11 @@ public class ServiceClient {
 
     public static void setCloak(String cloak) {
         try {
-            session.request(ServiceMethods.SetCloak, cloak).get();
+            session.request(ServiceMethods.SetCloak, cloak).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                }
+            });
         } catch (Exception e) {
             SaturnClient.LOGGER.error("Failed to set cloak (service): ", e);
         }
@@ -84,7 +88,11 @@ public class ServiceClient {
 
     public static void setHat(String hat) {
         try {
-            session.request(ServiceMethods.SetHat, hat).get();
+            session.request(ServiceMethods.SetHat, hat).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                }
+            });
         } catch (Exception e) {
             SaturnClient.LOGGER.error("Failed to set hat (service): ", e);
         }
@@ -92,7 +100,13 @@ public class ServiceClient {
 
     public static void buyCloak(String cloak) {
         try {
-            session.request(ServiceMethods.BuyCloak, cloak).get();
+            session.request(ServiceMethods.BuyCloak, cloak).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    Cloaks.availableCloaks.add(cloak);
+                }
+            });
         } catch (Exception e) {
             SaturnClient.LOGGER.error("Failed to buy cloak (service): ", e);
         }
@@ -100,7 +114,13 @@ public class ServiceClient {
 
     public static void buyHat(String hat) {
         try {
-            session.request(ServiceMethods.BuyHat, hat).get();
+            session.request(ServiceMethods.BuyHat, hat).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    Hats.availableHats.add(hat);
+                }
+            });
         } catch (Exception e) {
             SaturnClient.LOGGER.error("Failed to buy hat (service): ", e);
         }
@@ -108,7 +128,11 @@ public class ServiceClient {
 
     public static void emote(String emote) {
         try {
-            session.request(ServiceMethods.Emote, emote).get();
+            session.request(ServiceMethods.Emote, emote).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                }
+            });
         } catch (Exception e) {
             SaturnClient.LOGGER.error("Failed to emote (service): ", e);
         }
diff --git a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
index 937a79e..0bcd0f8 100644
--- a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
+++ b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
@@ -53,7 +53,6 @@ public class SvgTexture {
     }
 
     @Nullable
-    @SuppressWarnings("resource")
     public static Identifier getSvg(MinecraftClient client, Identifier svgImage, int width, int height) {
         Identifier id = Identifier
                 .of(svgImage.toString().replaceAll("\\.svg$", (width + "_" + height).toString() + ".png"));