aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
index d4aa86b50..e1a277d36 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt
@@ -73,7 +73,7 @@ object ItemNameResolver {
UtilsPatterns.enchantmentNamePattern.matchMatcher(enchantmentName) {
val name = group("name").trim { it <= ' ' }
val ultimate = group("format").lowercase().contains("§l")
- ((if (ultimate && name != "Ultimate Wise") "ULTIMATE_" else "")
+ ((if (ultimate && name != "Ultimate Wise" && name != "Ultimate Jerry") "ULTIMATE_" else "")
+ turboCheck(name).replace(" ", "_").replace("-", "_").uppercase()
+ ";" + group("level").romanToDecimal())
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 3026b0c56..be314a030 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -111,7 +111,8 @@ object ItemUtils {
if (name == "§fWisp's Ice-Flavored Water I Splash Potion") {
return NEUInternalName.WISP_POTION
}
- return NEUItems.getInternalName(this)?.asInternalName()
+ val internalName = NEUItems.getInternalName(this)?.replace("ULTIMATE_ULTIMATE_", "ULTIMATE_")
+ return internalName?.asInternalName()
}
fun ItemStack.isVanilla() = NEUItems.isVanillaItem(this)