From d2816938d9cfa30c464af649123e7c3ffec3f3bb Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Thu, 20 Jul 2023 04:28:06 +1000 Subject: Merge pull request #314 * hide ignored items * support contains * requested change * Using MultiFilter --- src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 2 ++ src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt | 1 + 2 files changed, 3 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index e9adfe055..9b06dfb8d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -115,6 +115,8 @@ object ItemUtils { return false } + fun ItemStack.getInternalNameOrNull() = getInternalName().takeIf { it != "" } + fun ItemStack.getInternalName(): String { if (name == "§fWisp's Ice-Flavored Water I Splash Potion") { return "WISP_POTION" diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt index 947019aa6..c8ecc2055 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt @@ -18,6 +18,7 @@ class MultiFilter { containsWord.clear() fill(hideNpcSell, "equals", equals) + fill(hideNpcSell, "exact", equals) fill(hideNpcSell, "startsWith", startsWith) fill(hideNpcSell, "endsWith", endsWith) fill(hideNpcSell, "contains", contains) -- cgit