fix: potion effects in exporter

2 files changed, 10 insertions, 3 deletions

diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt
index b4d583a..051ca86 100644
--- a/src/main/kotlin/util/SkyblockId.kt
+++ b/src/main/kotlin/util/SkyblockId.kt
@@ -251,10 +251,11 @@ val ItemStack.skyBlockId: SkyblockId?
 				val potionName = extraAttributes.getString("potion_name").getOrNull()
 				val potionLevel = extraAttributes.getInt("potion_level").getOrNull()
 				val potionType = extraAttributes.getString("potion_type").getOrNull()
+				fun String.potionNormalize() = uppercase().replace(" ", "_")
 				when {
-					potionName != null -> SkyblockId("POTION_${potionName.uppercase()};$potionLevel")
-					potionData != null -> SkyblockId("POTION_${potionData.uppercase()};$potionLevel")
-					potionType != null -> SkyblockId("POTION_${potionType.uppercase()}")
+					potionName != null -> SkyblockId("POTION_${potionName.potionNormalize()};$potionLevel")
+					potionData != null -> SkyblockId("POTION_${potionData.potionNormalize()};$potionLevel")
+					potionType != null -> SkyblockId("POTION_${potionType.potionNormalize()}")
 					else -> SkyblockId("WATER_BOTTLE")
 				}
 			}
diff --git a/src/main/kotlin/util/StringUtil.kt b/src/main/kotlin/util/StringUtil.kt
index dc98dc0..50c5367 100644
--- a/src/main/kotlin/util/StringUtil.kt
+++ b/src/main/kotlin/util/StringUtil.kt
@@ -5,6 +5,12 @@ object StringUtil {
 		return splitToSequence(" ") // TODO: better boundaries
 	}
 
+	fun String.camelWords(): Sequence<String> {
+		return splitToSequence(camelWordStart)
+	}
+
+	private val camelWordStart = Regex("((?<=[a-z])(?=[A-Z]))| ")
+
 	fun parseIntWithComma(string: String): Int {
 		return string.replace(",", "").toInt()
 	}