From 32ad18bae4e0f200a7e3a94a55c89edb4d1f6f7b Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 12 May 2023 16:33:53 +0200
Subject: Fixed wrong sorting order and error when using the second empty line
 in GardenVisitorDropStatistics

---
 .../skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt | 4 +++-
 .../at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
index 9e8621beb..91c36e5b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
@@ -34,7 +34,7 @@ object GardenVisitorDropStatistics {
     private val farmingExpPattern = "[+](?<amount>.*) Farming XP".toPattern()
     private var rewardsCount = mapOf<VisitorReward, Int>()
 
-    private fun formatDisplay(map: List<List<Any>>): MutableList<List<Any>> {
+    private fun formatDisplay(map: List<List<Any>>): List<List<Any>> {
         val newList = mutableListOf<List<Any>>()
         for (index in config.textFormat) {
             newList.add(map[index])
@@ -116,6 +116,8 @@ object GardenVisitorDropStatistics {
                 addAsSingletonList(format(count, reward.displayName, "§b"))
             }
         }
+        //15
+        addAsSingletonList("")
     }
 
     fun format(amount: Number, name: String, color: String, amountColor: String = color) =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
index 7651a1d3e..cf5e66890 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorReward.kt
@@ -3,11 +3,11 @@ package at.hannibal2.skyhanni.features.garden.visitor
 import java.util.regex.Pattern
 
 enum class VisitorReward(val displayName: String, val internalName: String, val pattern: Pattern) {
-    GREEN_BANDANA("§9Green Bandana", "GREEN_BANDANA", "[+]1x Green Bandana".toPattern()),
-    OVERGROWN_GRASS("§9Overgrown Grass", "OVERGROWN_GRASS", "[+]1x Overgrown Grass".toPattern()),
     FLOWERING_BOUQUET("§9Flowering Bouquet", "FLOWERING_BOUQUET", "[+]1x Flowering Bouquet".toPattern()),
+    OVERGROWN_GRASS("§9Overgrown Grass", "OVERGROWN_GRASS", "[+]1x Overgrown Grass".toPattern()),
+    GREEN_BANDANA("§9Green Bandana", "GREEN_BANDANA", "[+]1x Green Bandana".toPattern()),
     DEDICATION("§9Dedication IV", "DEDICATION;4", "Dedication (IV|4) Book".toPattern()),
+    MUSIC_RUNE("§9Music Rune", "MUSIC_RUNE;1", "[+]1x ◆ Music Rune [1I]".toPattern()),
     SPACE_HELMET("§cSpace Helmet", "DCTR_SPACE_HELM", "[+]Space Helmet".toPattern()),
     // Pretty sure that the symbol is ◆ but not 100%
-    MUSIC_RUNE("§9Music Rune", "MUSIC_RUNE;1", "[+]1x ◆ Music Rune [1I]".toPattern()),
 }
\ No newline at end of file
-- 
cgit