fix: more garden/croesus changes

Author: inglettronald

src/main/kotlin/dulkirmod/features/GardenVisitorAlert.kt

@@ -41,9 +41,9 @@ object GardenVisitorAlert {
             lastAlert = System.currentTimeMillis().toInt()
             val color = Utils.getColorString(DulkirConfig.bestiaryNotifColor)
             TitleUtils.drawStringForTime("${color}Max Visitors", 5000)
-            DulkirMod.mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .3f)
-            DulkirMod.mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .6f)
-            DulkirMod.mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .9f)
+            mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .3f)
+            mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .6f)
+            mc.thePlayer.playSound("note.pling", 1f * DulkirConfig.bestiaryNotifVol, .9f)
         }
     }
 

src/main/kotlin/dulkirmod/features/dungeons/Croesus.kt

@@ -48,7 +48,7 @@ object Croesus {
 
 				val tagList: NBTTagList = stack.getSubCompound("display", false)?.getTagList("Lore", 8) ?: continue
 				for (j in 0 until tagList.tagCount()) {
-					if (tagList.getStringTagAt(j) == "§aNo more Chests to open!") boolArray[i - 9] = true
+					if (tagList.getStringTagAt(j).startsWith("§8Opened Chest:")) boolArray[i - 9] = true
 				}
 			}
 		}

src/main/kotlin/dulkirmod/overlays/GardenInfoHud.kt

@@ -9,19 +9,19 @@ class GardenInfoHud : TextHud(false) {
     override fun getLines(lines: MutableList<String>?, example: Boolean) {
         if (!Utils.isInSkyblock()) return
         if (TabListUtils.area != "Garden") return
-        var i = 0
-        if (DulkirConfig.gardenMilestoneDisplay) {
-            lines?.add(i, TabListUtils.gardenMilestone)
-            ++i
+        if (DulkirConfig.gardenMilestoneDisplay && TabListUtils.gardenMilestone != "") {
+            lines?.add(TabListUtils.gardenMilestone)
         }
         if (DulkirConfig.visitorInfo) {
-            lines?.add(i, "Visitors: ${TabListUtils.numVisitors} - ${TabListUtils.timeTillNextVisitor}")
-            ++i
+            if (TabListUtils.numVisitors == -1) {
+                lines?.add("No Visitor info")
+            } else {
+                lines?.add("Visitors: ${TabListUtils.numVisitors} - ${TabListUtils.timeTillNextVisitor}")
+            }
         }
         if (DulkirConfig.composterAlert) {
             if (TabListUtils.emptyComposter) {
-                lines?.add(i, "Empty Composter!")
-                ++i
+                lines?.add("Empty Composter!")
             }
         }
     }

src/main/kotlin/dulkirmod/utils/TablistUtils.kt

@@ -9,7 +9,8 @@ import net.minecraft.world.WorldSettings.GameType
 // STOLEN FROM SKYTILS mmm yes
 object TabListUtils {
 
-    private val visitorPattern = "Visitors: \\((.+)\\)".toRegex()
+    private val visitorPattern = "Visitors: \\((\\d)\\)".toRegex()
+    private val nextVisitorPattern = "^Next Visitor: (.+)$".toRegex()
     private val areaPattern = "Area: (.+)".toRegex()
 
     var area: String = ""
@@ -18,7 +19,7 @@ object TabListUtils {
     var emptyComposter: Boolean = false
     var gardenMilestone: String = ""
     var timeTillNextVisitor: String = ""
-    var numVisitors: Int = 0
+    var numVisitors: Int = -1
     var archerName: String = ""
 
     private val playerInfoOrdering = object : Ordering<NetworkPlayerInfo>() {
@@ -70,21 +71,21 @@ object TabListUtils {
                     emptyComposter = trimmed.split(": ")[1] == "INACTIVE"
                 }
 
-                trimmed.startsWith("Milestone") -> gardenMilestone = trimmed
+                trimmed == "Crop Milestones:" -> {
+                    val index = scoreboardList.indexOf(line) + 1
+                    if (index < scoreboardList.size) {
+                        gardenMilestone = scoreboardList[index].trim()
+                    }
+                }
 
                 trimmed.contains(visitorPattern) -> {
-                    timeTillNextVisitor = visitorPattern.find(trimmed)!!.groupValues[1]
+                    numVisitors = Integer.parseInt(visitorPattern.find(trimmed)!!.groups[1]!!.value)
+                    numVisitorsFlag = true;
+                }
+
+                trimmed.contains(nextVisitorPattern) -> {
+                    timeTillNextVisitor = nextVisitorPattern.find(trimmed)!!.groups[1]!!.value
                     maxVisitors = timeTillNextVisitor == "Queue Full!"
-                    numVisitorsFlag = true
-
-                    // figure out how many visitors
-                    var index = scoreboardList.indexOf(line) + 1
-                    var visitors = 0
-                    while (index < scoreboardList.size && scoreboardList.get(index) != "" && visitors < 5) {
-                        visitors++
-                        index++
-                    }
-                    numVisitors = visitors
                 }
 
                 line.contains("(Archer") -> {
@@ -103,7 +104,7 @@ object TabListUtils {
             maxVisitors = false
         }
         if (!numVisitorsFlag) {
-            numVisitors = 0
+            numVisitors = -1
         }
     }