diff options
Diffstat (limited to 'src/main/java/at/hannibal2')
3 files changed, 16 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index d3cd1eb93..9b93e5293 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -17,6 +17,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.isEnchanted import at.hannibal2.skyhanni.utils.ItemUtils.isVanilla +import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftExportable import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftTransferable import at.hannibal2.skyhanni.utils.StringUtils.removeColor import com.google.gson.JsonObject @@ -189,6 +190,12 @@ class HideNotClickableItems { if (riftTransferable) { return false } + if (RiftAPI.inRift()) { + val riftExportable = stack.isRiftExportable() ?: return true + if (riftExportable) { + return false + } + } hideReason = "Not Rift-Transferable!" return true diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt index 449859639..b9beea397 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt @@ -5,4 +5,5 @@ data class CachedItemData( /** "" = not loaded */ var heldItem: String? = "", /** -1 = not loaded */ var sackInASack: Int? = -1, /** null = not loaded */ var riftTransferable: Boolean? = null, + /** null = not loaded */ var riftExportable: Boolean? = null, )
\ 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 a8e23f8d8..af0f26bcc 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -68,6 +68,14 @@ object SkyBlockItemModifierUtils { return data.riftTransferable } + fun ItemStack.isRiftExportable(): Boolean? { + val data = cachedData + if (data.riftExportable == null) { + data.riftExportable = getLore().any { it == "§5§kX§5 Rift-Exportable §kX" } + } + return data.riftExportable + } + private fun ItemStack.getPetInfo() = ConfigManager.gson.fromJson(getExtraAttributes()?.getString("petInfo"), JsonObject::class.java) |