aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
diff options
context:
space:
mode:
authorjani270 <69345714+jani270@users.noreply.github.com>2023-04-10 20:04:15 +0200
committerGitHub <noreply@github.com>2023-04-10 20:04:15 +0200
commitb814edd6e6d8d615e02191ddd3a7085ee81bf38f (patch)
treea92d9fce6bdb46ab5d5b785e5375d1d0f669619e /src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
parent251c36ddee87c7d160f33ad3c01d489d0a0865de (diff)
downloadskyhanni-b814edd6e6d8d615e02191ddd3a7085ee81bf38f.tar.gz
skyhanni-b814edd6e6d8d615e02191ddd3a7085ee81bf38f.tar.bz2
skyhanni-b814edd6e6d8d615e02191ddd3a7085ee81bf38f.zip
Added Dyes and Skins to the price calc (also removed funny prinLn's (#33)
Co-authored-by: Roman / Linnea Gräf <roman.graef@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 4229a80df..1a27d1e4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -108,17 +108,16 @@ object SkyBlockItemModifierUtils {
}
fun ItemStack.getPowerScroll(): String? {
- for (tags in tagCompound.keySet) {
- if (tags != "ExtraAttributes") continue
- val extraAttributes = tagCompound.getCompoundTag(tags)
- for (attributes in extraAttributes.keySet) {
- if (attributes == "power_ability_scroll") {
- return extraAttributes.getString(attributes)
- }
- }
- }
+ return tagCompound?.getCompoundTag("ExtraAttributes")?.getString("power_ability_scroll")
+ ?.takeUnless { it.isBlank() }
+ }
- return null
+ fun ItemStack.getHelmetSkin(): String? {
+ return tagCompound?.getCompoundTag("ExtraAttributes")?.getString("skin")?.takeUnless { it.isBlank() }
+ }
+
+ fun ItemStack.getArmorDye(): String? {
+ return tagCompound?.getCompoundTag("ExtraAttributes")?.getString("dye_item")?.takeUnless { it.isBlank() }
}
fun ItemStack.getAbilityScrolls(): List<String> {