removed unnecessary stuff from /shdebug

3 files changed, 15 insertions, 25 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
index bcbee1cad..e5c9067cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt
@@ -203,37 +203,27 @@ object SkillAPI {
     }
 
     @SubscribeEvent
-    fun onDebugDataCollectCurrent(event: DebugDataCollectEvent) {
-        event.title("Current Skill")
+    fun onDebugDataCollect(event: DebugDataCollectEvent) {
+        event.title("Skills")
         val storage = storage
         if (storage == null) {
             event.addIrrelevant("SkillMap is empty")
             return
         }
 
-        val skillType = activeSkill
-        if (skillType == null) {
-            event.addIrrelevant("activeSkill is null")
-            return
-        }
-
-        event.addData {
-            storage[skillType]?.let { skillInfo ->
-                addDebug(skillType, skillInfo)
+        event.addIrrelevant {
+            val activeSkill = activeSkill
+            if (activeSkill == null) {
+                add("activeSkill is null")
+            } else {
+                add("active skill:")
+                storage[activeSkill]?.let { skillInfo ->
+                    addDebug(activeSkill, skillInfo)
+                }
+                add("")
+                add("")
             }
-        }
-    }
 
-    @SubscribeEvent
-    fun onDebugDataCollectAll(event: DebugDataCollectEvent) {
-        event.title("All Skills")
-        val storage = storage
-        if (storage == null) {
-            event.addIrrelevant("SkillMap is empty")
-            return
-        }
-
-        event.addIrrelevant {
             for ((skillType, skillInfo) in storage) {
                 addDebug(skillType, skillInfo)
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index c175c219f..05668871f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -99,7 +99,7 @@ object GardenNextJacobContest {
             return
         }
 
-        event.addData {
+        event.addIrrelevant {
             add("Current time: ${SimpleTimeMark.now()}")
             add("")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 5983e5ab6..19e078638 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -600,7 +600,7 @@ object GardenVisitorFeatures {
             return
         }
 
-        event.addData {
+        event.addIrrelevant {
             val visitors = VisitorAPI.getVisitors()
 
             add("visitors: ${visitors.size}")