diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt index e130ccd9..a8a24249 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt @@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt index aa91422e..12732258 100644 --- a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt +++ b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt @@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt index f4fbd2bf..afaab596 100644 --- a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt +++ b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt @@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt index 8f15528e..4bb9b080 100644 --- a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt +++ b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt @@ -3,6 +3,7 @@ package com.willfp.eco.internal.spigot.proxy.v1_19_R1 import com.willfp.eco.core.items.TestableItem import com.willfp.eco.core.recipe.parts.EmptyTestableItem import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy +import com.willfp.eco.internal.spigot.proxy.common.toMaterial import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.SnbtPrinterTagVisitor import net.minecraft.nbt.TagParser @@ -44,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt index bf94e70d..2d7a5ab4 100644 --- a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt +++ b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt @@ -44,7 +44,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt b/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt index 45379534..c3bad750 100644 --- a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt +++ b/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt @@ -44,7 +44,7 @@ class SNBTConverter : SNBTConverterProxy { val nms = CraftItemStack.asNMSCopy(itemStack) val nmsTag = nms.save(CompoundTag()) nmsTag.remove("Count") - return tag.copy().merge(nmsTag) == nmsTag + return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type } override fun getItem(): ItemStack = item diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 00f8ebda..feeb4e61 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { compileOnly("com.github.jiangdashao:matrix-api-repo:317d4635fd") compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.202") compileOnly("me.clip:placeholderapi:2.10.10") - compileOnly("com.github.oraxen:oraxen:bea381fb82") + compileOnly("com.github.oraxen:oraxen:1.155.0") compileOnly("com.github.brcdev-minecraft:shopgui-api:3.0.0") compileOnly("com.github.LoneDev6:API-ItemsAdder:2.4.7") compileOnly("com.arcaniax:HeadDatabase-API:1.3.0")