From dcd9ee93e42b887c72bdc9e36700d0a183f81135 Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Wed, 17 Apr 2024 16:17:13 +0200 Subject: Fix: Gemstones item query (#1468) Co-authored-by: Brady Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com> Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> --- src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 8f68c2fa0..1193cae1c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -29,6 +29,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchFirst import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor +import at.hannibal2.skyhanni.utils.StringUtils.removeNonAscii import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import com.google.gson.annotations.Expose import net.minecraft.item.ItemStack @@ -278,7 +279,7 @@ object SackAPI { } sackListInternalNames = uniqueSackItems.map { it.asString() }.toSet() - sackListNames = uniqueSackItems.map { it.itemNameWithoutColor.uppercase() }.toSet() + sackListNames = uniqueSackItems.map { it.itemNameWithoutColor.removeNonAscii().trim().uppercase() }.toSet() } private fun updateSacks(changes: SackChangeEvent) { @@ -352,21 +353,21 @@ object SackAPI { var roughPrice: Long = 0, var flawedPrice: Long = 0, var finePrice: Long = 0, - ): AbstractSackItem() + ) : AbstractSackItem() data class SackRune( var stack: ItemStack? = null, var lvl1: Int = 0, var lvl2: Int = 0, var lvl3: Int = 0, - ): AbstractSackItem() + ) : AbstractSackItem() data class SackOtherItem( var internalName: NEUInternalName = NEUInternalName.NONE, var colorCode: String = "", var total: Int = 0, var magmaFish: Int = 0, - ): AbstractSackItem() + ) : AbstractSackItem() abstract class AbstractSackItem( var stored: Int = 0, -- cgit