diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-05-20 12:18:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-20 12:18:05 +0200 |
| commit | 4eb39185cb08727050d9577fc5a6c91921b83eaf (patch) | |
| tree | 68483e4b75c059848c82e26c9df2ead865d99907 | |
| parent | 649477684d8b0ffca316ba042ebddc657f928af0 (diff) | |
| download | skyhanni-4eb39185cb08727050d9577fc5a6c91921b83eaf.tar.gz skyhanni-4eb39185cb08727050d9577fc5a6c91921b83eaf.tar.bz2 skyhanni-4eb39185cb08727050d9577fc5a6c91921b83eaf.zip | |
Fix: Ultimate Jerry (#1842)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 3 |
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) |