aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMTOnline69 <97001154+MTOnline69@users.noreply.github.com>2024-10-06 21:01:37 +0100
committerGitHub <noreply@github.com>2024-10-06 22:01:37 +0200
commit3326753f29824791df28a941e2f4fc239992c9f1 (patch)
treec61ca688946f2056e3ebacbb86568c39e642ad7f
parent41d59a6888a8e1132e57dfab279efa8426853970 (diff)
downloadskyhanni-3326753f29824791df28a941e2f4fc239992c9f1.tar.gz
skyhanni-3326753f29824791df28a941e2f4fc239992c9f1.tar.bz2
skyhanni-3326753f29824791df28a941e2f4fc239992c9f1.zip
Fix: Wiki keybind searching for <null> (#2682)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
index fc6d0be06..df0468226 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
@@ -53,7 +53,7 @@ public class BetterWikiCommandConfig {
public boolean menuOpenWiki = false;
@Expose
- @ConfigOption(name = "Fandom Wiki Key", desc = "Search for an item on Wiki with this keybind.\n" +
+ @ConfigOption(name = "Wiki Key", desc = "Search for an item's wiki page with this keybind.\n" +
"§cFor an optimal experience, do §lNOT §cbind this to a mouse button.")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int wikiKeybind = Keyboard.KEY_NONE;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
index e72ad09c5..e6a1ef4e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
import at.hannibal2.skyhanni.utils.ChatUtils
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
-import at.hannibal2.skyhanni.utils.ItemUtils.itemName
import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.NEUItems
@@ -70,7 +69,7 @@ object WikiManager {
private fun wikiTheItem(item: ItemStack, autoOpen: Boolean, useFandom: Boolean = config.useFandom) {
val itemDisplayName =
- item.itemName.replace("§a✔ ", "").replace("§c✖ ", "")
+ item.displayName.replace("§a✔ ", "").replace("§c✖ ", "")
val internalName = item.getInternalName().asString()
val wikiUrlSearch = if (internalName != "NONE") internalName else itemDisplayName.removeColor()