Improve Skyblocker compatibility

Author: kevinthegreat1

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Skyblock Mod 1.10.1 for 1.20.4
+
+Improve Skyblocker compatibility
+
+
 ## Skyblock Mod 1.10.0 for 1.20.4
 
 Add waypoints.  

build.gradle

@@ -17,13 +17,18 @@ loom {
 }
 
 repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
-
 	maven { url "https://maven.terraformersmc.com/releases/" }
+	exclusiveContent {
+		forRepository {
+			maven {
+				name = "Modrinth"
+				url = "https://api.modrinth.com/maven"
+			}
+		}
+		filter {
+			includeGroup "maven.modrinth"
+		}
+	}
 	maven { url "https://jitpack.io" }
 }
 
@@ -36,13 +41,16 @@ dependencies {
 	// Fabric API.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    include modImplementation("org.eclipse.jgit:org.eclipse.jgit:${project.jgit_version}")
-
 	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+
+	modCompileOnly "maven.modrinth:skyblocker-liap:v${project.skyblocker_version}+${project.minecraft_version}"
+
 	include modImplementation("com.github.0x3C50:Renderer:${project.renderer_version}") {
 		exclude group: "io.github.ladysnake" exclude module: "satin"
 	}
 
+	include modImplementation("org.eclipse.jgit:org.eclipse.jgit:${project.jgit_version}")
+
 	// Apache Commons Math
 	include implementation("org.apache.commons:commons-math3:${project.commons_math_version}")
 

gradle.properties

@@ -8,13 +8,14 @@ org.gradle.jvmargs = -Xmx1G
 	loader_version = 0.15.3
 
 # Mod Properties
-	mod_version = 1.10.0
+	mod_version = 1.10.1
 	maven_group = com.kevinthegreat.skyblockmod
 	archives_base_name = skyblock-mod
 
 # Dependencies
 	fabric_version = 0.92.0+1.20.4
 	modmenu_version = 9.0.0
+	skyblocker_version = 1.20.2
 	jgit_version = 6.8.0.202311291450-r
     renderer_version = master-SNAPSHOT
 	## Apache Commons Math (https://mvnrepository.com/artifact/org.apache.commons/commons-math3)

src/main/java/com/kevinthegreat/skyblockmod/SkyblockMod.java

@@ -83,6 +83,7 @@ private void registerEvents() {
         mythologicalRitual.init();
         HudRenderCallback.EVENT.register(dungeonMap::render);
         ClientReceiveMessageEvents.ALLOW_GAME.register(this::onChatMessage);
+        ClientReceiveMessageEvents.GAME_CANCELED.register(this::onChatMessage);
         ScreenEvents.AFTER_INIT.register(experiments::start);
         Waypoints.init();
     }

src/main/java/com/kevinthegreat/skyblockmod/util/Info.java

@@ -4,6 +4,7 @@
 import com.google.gson.JsonParser;
 import com.kevinthegreat.skyblockmod.SkyblockMod;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.PlayerListEntry;
@@ -15,6 +16,7 @@
 
 public class Info implements ChatListener {
     private static final String PROFILE_PREFIX = "§r§e§lProfile: §r§a";
+    public static final boolean SKYBLOCKER_LOADED = FabricLoader.getInstance().isModLoaded("skyblocker");
     public boolean hypixel = false;
     public boolean skyblock = false;
     public boolean catacombs = false;
@@ -109,7 +111,7 @@ private void updateFromScoreboard(MinecraftClient client) {
     private void updateLocRaw() {
         if (hypixel) {
             long currentTime = System.currentTimeMillis();
-            if (!sentLocRaw && currentTime > clientWorldJoinTime + 1000 && currentTime > lastLocRaw + 15000) {
+            if (!sentLocRaw && currentTime > clientWorldJoinTime + 1000 && currentTime > lastLocRaw + 15000 && !SKYBLOCKER_LOADED) {
                 SkyblockMod.skyblockMod.message.sendMessageAfterCooldown("/locraw");
                 sentLocRaw = true;
                 lastLocRaw = currentTime;

src/main/java/com/kevinthegreat/skyblockmod/util/Message.java

@@ -1,5 +1,6 @@
 package com.kevinthegreat.skyblockmod.util;
 
+import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 import net.minecraft.util.Pair;
@@ -119,11 +120,15 @@ public void addMessage(Text message) {
     }
 
     public void sendMessageAfterCooldown(String message) {
-        if (lastMessage + 200 < System.currentTimeMillis()) {
-            sendMessage(message);
-            lastMessage = System.currentTimeMillis();
+        if (Info.SKYBLOCKER_LOADED) {
+            MessageScheduler.INSTANCE.sendMessageAfterCooldown(message);
         } else {
-            messageQueue.add(new Pair<>(message, 0));
+            if (lastMessage + 200 < System.currentTimeMillis()) {
+                sendMessage(message);
+                lastMessage = System.currentTimeMillis();
+            } else {
+                messageQueue.add(new Pair<>(message, 0));
+            }
         }
     }