From fe815d80f1d995ebaa65c52da8f9efd9bf166cf3 Mon Sep 17 00:00:00 2001 From: HiZe_ Date: Sun, 4 Jun 2023 13:13:06 +0200 Subject: Pocket sack in a sack display (#193) --- src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt | 1 + .../java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt index 91eeb04fd..b6cf391b7 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt @@ -3,4 +3,5 @@ package at.hannibal2.skyhanni.utils data class CachedItemData( /** -1 = not loaded */ var petCandies: Int? = -1, /** "" = not loaded */ var heldItem: String? = "", + /** -1 = not loaded */ var sackInASack: Int? = -1, ) \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt index d9f121951..19177aaa5 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -145,6 +145,14 @@ object SkyBlockItemModifierUtils { enchantments.keySet.associateWith { enchantments.getInteger(it) } } + fun ItemStack.getAppliedPocketSackInASack(): Int?{ + val data = cachedData + if (data.sackInASack == -1) { + data.sackInASack = getAttributeInt("sack_pss") + } + return data.sackInASack + } + fun ItemStack.getGemstones() = getExtraAttributes()?.let { val list = mutableListOf() for (attributes in it.keySet) { -- cgit