Upgrade to Solstice 1.6.0

build.gradle

@@ -24,6 +24,16 @@ repositories {
     maven { url 'https://repo.minebench.de' }
 
     maven { url 'https://maven.alexdevs.me/releases' }
+
+    // trinkets deps
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/"
+    }
+    maven {
+        name = "Ladysnake Libs"
+        url = 'https://maven.ladysnake.org/releases'
+    }
 }
 
 dependencies {
@@ -47,7 +57,8 @@ dependencies {
     modImplementation "cc.reconnected:rcc-library:${project.rcclibrary_version}"
     modImplementation "cc.reconnected:rcc-discord:${project.rccdiscord_version}"
 
-    modImplementation "me.alexdevs:solstice:${project.solstice_version}"
+    modCompileOnly "me.alexdevs:solstice:${project.solstice_version}"
+    modRuntimeOnly "me.alexdevs:solstice:${project.solstice_version}"
 
     include implementation("org.java-websocket:Java-WebSocket:${project.websocket_version}")
 

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.9
 
 # Mod Properties
-mod_version=1.8.4
+mod_version=1.8.5
 maven_group=cc.reconnected
 archives_base_name=rcc-chatbox
 
@@ -18,7 +18,7 @@ fabric_version=0.92.2+1.20.1
 
 rcclibrary_version=1.0.0
 rccdiscord_version=1.8.1
-solstice_version=1.4.1+1.20.1
+solstice_version=1.6.0+1.20.1
 
 permissions_api_version=0.2-SNAPSHOT
 
@@ -30,4 +30,5 @@ adventure_legacy_serializer_version=4.14.0
 placeholderapi_version=2.1.3+1.20.1
 
 websocket_version=1.5.7
-jda_version=5.0.2
+jda_version=5.0.2
+trinkets_version=3.7.2

src/main/java/cc/reconnected/chatbox/integrations/AfkTracker.java

@@ -1,15 +1,16 @@
 package cc.reconnected.chatbox.integrations;
 
 import cc.reconnected.chatbox.RccChatbox;
+import net.minecraft.server.network.ServerPlayerEntity;
 
 import java.util.UUID;
 
 public class AfkTracker {
-    public static boolean isPlayerAfk(UUID uuid) {
+    public static boolean isPlayerAfk(ServerPlayerEntity player) {
         if (!RccChatbox.isSolsticeLoaded())
             return false;
 
-        return SolsticeIntegration.isPlayerAfk(uuid);
+        return SolsticeIntegration.isPlayerAfk(player);
     }
 
 }

src/main/java/cc/reconnected/chatbox/integrations/SolsticeIntegration.java

@@ -2,12 +2,13 @@
 
 import me.alexdevs.solstice.Solstice;
 import me.alexdevs.solstice.modules.afk.AfkModule;
+import net.minecraft.server.network.ServerPlayerEntity;
 
 import java.util.UUID;
 
 public class SolsticeIntegration {
 
-    public static boolean isPlayerAfk(UUID player) {
+    public static boolean isPlayerAfk(ServerPlayerEntity player) {
         var afkModule = Solstice.modules.getModule(AfkModule.class);
         return afkModule.isPlayerAfk(player);
     }

src/main/java/cc/reconnected/chatbox/models/User.java

@@ -28,7 +28,7 @@ private static void fillInData(User user, @Nullable ServerPlayerEntity entity, b
         PlayerMeta playerData;
         if(entity != null) {
             playerData = PlayerMeta.getPlayer(entity);
-            user.afk = AfkTracker.isPlayerAfk(entity.getUuid());
+            user.afk = AfkTracker.isPlayerAfk(entity);
         } else {
             playerData = PlayerMeta.getPlayer(UUID.fromString(user.uuid));
             user.afk = false;

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
     "luckperms": ">=5.4"
   },
   "suggests": {
-    "solstice": ">=1.0.0+1.20.1",
+    "solstice": ">=1.6.0+1.20.1",
     "rcc-discord": ">=1.8.1"
   }
 }