Fix inputs

Hopefully fixed auth timeout

src/main/java/org/saturnclient/client/ServiceClient.java

@@ -2,6 +2,7 @@ package org.saturnclient.client;
 
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.provider.Providers;
@@ -15,15 +16,48 @@ public class ServiceClient {
     private static Session session;
     public static UUID uuid;
 
+    public static void initialize() {
+        new Thread(() -> {
+            if (authenticate()) {
+                Cloaks.initialize();
+                Hats.initialize();
+                Providers.saturn.logInfo("Saturn Session initialization complete");
+            } else {
+                Providers.saturn.logError("Failed to authenticate with the server");
+            }
+        }).start();
+    }
+
     public static boolean connectTimeout() {
         try {
-            session = Session.connect("wss://saturn-server.selimaj.dev", 10, TimeUnit.SECONDS);
+            session = Session.connect("wss://saturn-server.selimaj.dev", 2, TimeUnit.MINUTES);
             return true;
+        } catch (TimeoutException e) {
+            System.out.println("Session Server timeout");
+            return false;
         } catch (Exception e) {
+            e.printStackTrace();
             return false;
         }
     }
 
+    public static boolean connectMultiTimeout() {
+        for (int i = 0; i < 5; i++) {
+            if (connectTimeout()) {
+                return true;
+            }
+
+            Providers.saturn.logError("Failed to authenticate (attempt " + (i + 1) + ")");
+
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException ignored) {
+            }
+        }
+
+        return false;
+    }
+
     public static boolean authenticate() {
         MinecraftClientRef client = Providers.saturn.getClient();
 
@@ -49,7 +83,7 @@ public class ServiceClient {
 
             Providers.saturn.logInfo("Authenticating with UUID: " + uuid);
 
-            if (!connectTimeout()) {
+            if (!connectMultiTimeout()) {
                 Providers.saturn.logError("Unable to authenticate: Session Server Timeout");
                 return false;
             }
@@ -77,6 +111,9 @@ public class ServiceClient {
     }
 
     public static void setCloak(String itemId) {
+        if (session == null)
+            return;
+
         try {
             session.request(ServiceMethods.SetCloak, itemId).whenComplete((msg, throwable) -> {
                 if (throwable != null) {
@@ -96,6 +133,9 @@ public class ServiceClient {
     }
 
     public static void setHat(String itemId) {
+        if (session == null)
+            return;
+
         try {
             session.request(ServiceMethods.SetHat, itemId).whenComplete((msg, throwable) -> {
                 if (throwable != null) {
@@ -115,6 +155,9 @@ public class ServiceClient {
     }
 
     public static void buyCloak(String itemId) {
+        if (session == null)
+            return;
+
         try {
             session.request(ServiceMethods.BuyCloak, itemId).whenComplete((msg, throwable) -> {
                 if (throwable != null) {
@@ -129,6 +172,9 @@ public class ServiceClient {
     }
 
     public static void buyHat(String itemId) {
+        if (session == null)
+            return;
+
         try {
             session.request(ServiceMethods.BuyHat, itemId).whenComplete((msg, throwable) -> {
                 if (throwable != null) {
@@ -143,6 +189,9 @@ public class ServiceClient {
     }
 
     public static void emote(String emote) {
+        if (session == null)
+            return;
+
         try {
             session.request(ServiceMethods.Emote,
                     new ServiceMethods.Types.EmoteRequest(emote, SaturnPlayer.getExternalUUIDAsString()))
@@ -157,6 +206,9 @@ public class ServiceClient {
     }
 
     public static void eventHandlers() {
+        if (session == null)
+            return;
+
         session.onNotification(ServiceMethods.EmoteEvent, (data) -> {
             if (data == null) {
                 return;
@@ -182,6 +234,9 @@ public class ServiceClient {
     }
 
     public static SaturnPlayer getPlayer(UUID uuid, String name) {
+        if (session == null)
+            return null;
+
         try {
             ServiceMethods.Types.Player player = session.request(ServiceMethods.GetPlayer, uuid.toString()).join();
 

src/main/java/org/saturnclient/common/ref/game/EffectRef.java

@@ -1,5 +1,6 @@
 package org.saturnclient.common.ref.game;
 
+import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.asset.SpriteRef;
 
 public interface EffectRef {
@@ -7,6 +8,10 @@ public interface EffectRef {
 
     SpriteRef getIcon();
 
+    default IdentifierRef getIconId() {
+        return null;
+    }
+
     boolean isInfinite();
 
     String getInfiniteText();

src/main/java/org/saturnclient/mod/mods/StatusEffectsMod.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.saturnclient.common.provider.FeatureProvider;
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.common.ref.asset.SpriteRef;
 import org.saturnclient.common.ref.game.EffectRef;
 import org.saturnclient.config.property.BoolProperty;
 import org.saturnclient.config.property.Property;
@@ -63,7 +64,12 @@ public class StatusEffectsMod extends Mod implements HudMod {
             if (!effect.shouldShowIcon())
                 continue;
 
-            scope.drawSpriteStretched(effect.getIcon(), 0, 18 * row, 16, 16);
+            SpriteRef sprite = effect.getIcon();
+            if (sprite == null) {
+                scope.drawTexture(effect.getIconId(), 0, 18 * row, 0, 0, 16, 16);
+            } else {
+                scope.drawSpriteStretched(sprite, 0, 18 * row, 16, 16);
+            }
             scope.drawText(0.5f, durationString(effect),
                     18, 18 * row + 3,
                     layout.font.value, -1);

src/main/java/org/saturnclient/ui/components/inputs/Input.java

@@ -64,19 +64,18 @@ public abstract class Input extends Element {
     public void render(RenderScope renderScope, ElementContext ctx) {
         checkReset();
 
-        renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000);
+        renderScope.drawRoundedRectangle(0, 0, width, height, 10, Theme.PRIMARY.value);
 
         int scrollOffset = getScrollOffset();
         String visibleText = getVisibleText(scrollOffset);
-        int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
+        renderScope.drawText(0.6f, visibleText, 4, 4, Theme.FONT.value, Theme.PRIMARY_FG.value);
-        renderScope.drawText(0.6f, visibleText, 4, 4, Theme.FONT.value, textColor);
 
         if (focused) {
             int cursorX = 4 +
                     (int) (Fonts.getWidth(visibleText.substring(0, cursorPosition - scrollOffset), Theme.FONT.value)
                             * 0.6f);
 
-            renderScope.drawRectangle(cursorX, 2, 1, height - 4, 0xFFFFFFFF);
+            renderScope.drawRectangle(cursorX, 2, 1, height - 4, Theme.ACCENT.value);
         }
     }