From bc2ccc0c39495921aee82664266c1756f016b388 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Fri, 29 Jul 2022 16:14:04 +0200 Subject: added support for vanilla items from neu. allowing all vanilla items to be sold to npc --- .../skyhanni/items/abilitycooldown/WitherImpactDetection.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/items/abilitycooldown') diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt index 52caa59d0..4bc2939fd 100644 --- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.items.abilitycooldown import at.hannibal2.skyhanni.events.PacketEvent -import at.hannibal2.skyhanni.utils.ItemUtil.asStringSet -import at.hannibal2.skyhanni.utils.ItemUtil.getExtraAttributes import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.Minecraft import net.minecraft.init.Items +import net.minecraft.item.ItemStack +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.nbt.NBTTagList import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement import net.minecraft.network.play.server.S1CPacketEntityMetadata import net.minecraft.network.play.server.S2APacketParticles @@ -62,4 +63,12 @@ class WitherImpactDetection(private val itemAbilityCooldown: ItemAbilityCooldown if (diff < 0) lastShieldUse = -1 } } + + private fun getExtraAttributes(item: ItemStack?): NBTTagCompound? { + return if (item == null || !item.hasTagCompound()) { + null + } else item.getSubCompound("ExtraAttributes", false) + } + + private fun NBTTagList.asStringSet() = (0..tagCount()).mapTo(hashSetOf()) { getStringTagAt(it) } } \ No newline at end of file -- cgit