Replaced ItemWarnEntry with VisitorReward. This should fix some errors.

2 files changed, 37 insertions, 13 deletions

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 a1e795e72..22a53c388 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
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.visitor
 
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
-import at.hannibal2.skyhanni.config.features.garden.visitor.RewardWarningConfig.ItemWarnEntry
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -48,6 +47,8 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import com.google.gson.JsonArray
+import com.google.gson.JsonPrimitive
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiEditSign
 import net.minecraft.entity.EntityLivingBase
@@ -607,7 +608,21 @@ class GardenVisitorFeatures {
         event.move(3, "garden.visitorHypixelArrivedMessage", "garden.visitors.hypixelArrivedMessage")
         event.move(3, "garden.visitorHideChat", "garden.visitors.hideChat")
         event.move(11, "garden.visitors.rewardWarning.drops", "garden.visitors.rewardWarning.drops") { element ->
-            ConfigUtils.migrateIntArrayListToEnumArrayList(element, ItemWarnEntry::class.java)
+            ConfigUtils.migrateIntArrayListToEnumArrayList(element, VisitorReward::class.java)
+        }
+        event.move(12, "garden.visitors.rewardWarning.drops", "garden.visitors.rewardWarning.drops") { element ->
+            val drops = JsonArray()
+            for (jsonElement in element.asJsonArray) {
+                val old = jsonElement.asString
+                val new = VisitorReward.entries.firstOrNull { old.startsWith(it.name) }
+                if (new == null) {
+                    println("error with migrating old VisitorReward entity: '$old'")
+                    continue
+                }
+                drops.add(JsonPrimitive(new.name))
+            }
+
+            drops
         }
     }
 
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 d6aabd3b5..cdaee688d 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
@@ -1,26 +1,35 @@
 package at.hannibal2.skyhanni.features.garden.visitor
 
-import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment
+import at.hannibal2.skyhanni.config.HasLegacyId
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
 
-enum class VisitorReward(private val rawInternalName: String) {
-    FLOWERING_BOUQUET("FLOWERING_BOUQUET"),
-    OVERGROWN_GRASS("OVERGROWN_GRASS"),
-    GREEN_BANDANA("GREEN_BANDANA"),
-    DEDICATION("DEDICATION;4"),
-    MUSIC_RUNE("MUSIC_RUNE;1"),
-    SPACE_HELMET("DCTR_SPACE_HELM"),
-    CULTIVATING("CULTIVATING;1"),
-    REPLENISH("REPLENISH;1"),
+enum class VisitorReward(private val rawInternalName: String, val displayName: String, private val legacyId: Int = -1) : HasLegacyId {
+    FLOWERING_BOUQUET("FLOWERING_BOUQUET", "§9Flowering Bouquet", legacyId = 0),
+    OVERGROWN_GRASS("OVERGROWN_GRASS", "§9Overgrown Grass", legacyId = 1),
+    GREEN_BANDANA("GREEN_BANDANA", "§9Green Bandana", legacyId = 2),
+    DEDICATION("DEDICATION;4", "§9Dedication IV", legacyId = 3),
+    MUSIC_RUNE("MUSIC_RUNE;1", "§9Music Rune", legacyId = 4),
+    SPACE_HELMET("DCTR_SPACE_HELM", "§cSpace Helmet", legacyId = 5),
+    CULTIVATING("CULTIVATING;1", "§9Cultivating I", legacyId = 6),
+    REPLENISH("REPLENISH;1", "§9Replenish I", legacyId = 7),
     ;
 
     private val internalName by lazy { rawInternalName.asInternalName() }
     val itemStack by lazy { internalName.getItemStack() }
-    val displayName by lazy { itemStack.nameWithEnchantment ?: internalName.asString() }
+    // TODO use this instead of hard coded item names once moulconfig no longer calls toString before the neu repo gets loaded
+//     val displayName by lazy { itemStack.nameWithEnchantment ?: internalName.asString() }
 
     companion object {
         fun getByInternalName(internalName: NEUInternalName) = entries.firstOrNull { it.internalName == internalName }
     }
+
+    override fun getLegacyId(): Int {
+        return legacyId
+    }
+
+    override fun toString(): String {
+        return displayName
+    }
 }