summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt2
2 files changed, 2 insertions, 15 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index 580ee2a95..95dad660c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -14,8 +14,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments
import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import at.hannibal2.skyhanni.utils.StringUtils.removeResets
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonObject
import io.github.moulberry.notenoughupdates.recipes.NeuRecipe
import net.minecraft.client.Minecraft
import net.minecraft.init.Items
@@ -78,19 +76,6 @@ object ItemUtils {
return list
}
- fun hasAttributes(stack: ItemStack): Boolean {
- if (!stack.hasTagCompound()) return false
- val tagCompound = stack.tagCompound
- if (!tagCompound.hasKey("ExtraAttributes")) return false
- val extraAttributes = tagCompound.getCompoundTag("ExtraAttributes")
- try {
- val json = GsonBuilder().create().fromJson(extraAttributes.toString(), JsonObject::class.java)
- return json.has("attributes")
- } catch (_: Exception) {
- return false
- }
- }
-
fun ItemStack.getInternalName() = getInternalNameOrNull() ?: NEUInternalName.NONE
fun ItemStack.getInternalNameOrNull(): NEUInternalName? {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
index 2b3ece2c7..7d38fa58b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt
@@ -151,6 +151,8 @@ object SkyBlockItemModifierUtils {
}.sortedBy { it.first }
}
+ fun ItemStack.hasAttributes() = getAttributes() != null
+
fun ItemStack.getReforgeName() = getAttributeString("modifier")?.let {
when {
it == "pitchin" -> "pitchin_koi"