From 8195fe5b198019cdef290b433e7d6f1a96e22cc2 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:27:28 +0200
Subject: bunch of small fixes

---
 .../skyhanni/features/event/winter/ReindrakeWarpHelper.kt          | 3 ++-
 src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt   | 2 +-
 .../hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt  | 7 +++++--
 src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
index 7131426d4..30a1b87e8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/ReindrakeWarpHelper.kt
@@ -20,10 +20,11 @@ object ReindrakeWarpHelper {
 
     /**
      * REGEX-TEST: §c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!
+     * REGEX-TEST: §c§lWOAH! §r§cA §r§4Reindrake §r§cwas summoned from the depths!
      */
     private val spawnPattern by patternGroup.pattern(
         "spawn.message",
-        "§c§lWOAH! §cA §4Reindrake §cwas summoned from the depths!",
+        "§c§lWOAH! (?:§r)?§cA (?:§r)?§4Reindrake (?:§r)?§cwas summoned from the depths!",
     )
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
index 3c1e844a6..5ece5897c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt
@@ -43,7 +43,7 @@ object IslandAreas {
     private var paths = mapOf<GraphNode, Graph>()
     var display: Renderable? = null
     private var targetNode: GraphNode? = null
-    private var currentAreaName = ""
+    var currentAreaName = ""
     private val textInput = TextInput()
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
index 7f67dd98c..e753948bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/pathfind/NavigationHelper.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.IslandGraphs
 import at.hannibal2.skyhanni.data.model.GraphNode
 import at.hannibal2.skyhanni.data.model.GraphNodeTag
 import at.hannibal2.skyhanni.data.model.findShortestDistance
+import at.hannibal2.skyhanni.features.misc.IslandAreas
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.chat.Text
@@ -60,8 +61,8 @@ object NavigationHelper {
                 sendNavigateMessage(name, goBack)
             }
             val tag = node.tags.first { it in allowedTags }
-            component.hover =
-                ("§eClick to start navigating to\n" + "§7Type: §r${tag.displayName}\n" + "§7Distance: §e$distance blocks").asComponent()
+            val d = "Name: $name\n§7Type: §r${tag.displayName}\n§7Distance: §e$distance blocks\n§eClick to start navigating!"
+            component.hover = d.asComponent()
             component
         }
     }
@@ -78,6 +79,8 @@ object NavigationHelper {
         for (node in distances.sorted().keys) {
             // hiding areas that are none
             if (node.name == "no_area") continue
+            // no need to navigate to the current area
+            if (node.name == IslandAreas.currentAreaName) continue
             val tag = node.tags.first { it in allowedTags }
             val name = "${node.name} §7(${tag.displayName}§7)"
             if (name in names) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 19ec3c5ce..4b75b3fea 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -117,6 +117,7 @@ object SkyHanniDebugsAndTests {
             testLocation = null
             ChatUtils.chat("reset test waypoint")
             IslandGraphs.stop()
+            return
         }
 
         val x = args[0].toDouble()
-- 
cgit