diff options
author | Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> | 2024-04-17 16:17:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-17 16:17:13 +0200 |
commit | dcd9ee93e42b887c72bdc9e36700d0a183f81135 (patch) | |
tree | b36a42b6a49025ffbaecc983b16203629bf3c0c2 /src/main/java/at/hannibal2/skyhanni/data | |
parent | 6f07b2edb082bb8624b8208e3a9fbc0eca8e7343 (diff) | |
download | skyhanni-dcd9ee93e42b887c72bdc9e36700d0a183f81135.tar.gz skyhanni-dcd9ee93e42b887c72bdc9e36700d0a183f81135.tar.bz2 skyhanni-dcd9ee93e42b887c72bdc9e36700d0a183f81135.zip |
Fix: Gemstones item query (#1468)
Co-authored-by: Brady <thatgravyboat@gmail.com>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 9 |
1 files changed, 5 insertions, 4 deletions
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, |