Fixed imports

fix oraxen and SNBT

.github/workflows/checkstyle.yml

@@ -1,15 +0,0 @@
-name: Check PR Codestyle
-on: [ pull_request ]
-
-jobs:
-  checkstyle:
-    name: Checkstyle
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dbelyaev/action-checkstyle@v0.5.1
-        with:
-          github_token: ${{ secrets.github_token }}
-          reporter: github-pr-review
-          level: warning
-          checkstyle_config: ../../config/checkstyle/checkstyle.xml

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

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

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

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

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

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

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")

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

@@ -294,7 +294,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("MythicMobs") { CustomEntitiesManager.register(CustomEntitiesMythicMobs()) },
 
             // Custom Items
-            IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen()) },
+            IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen(this)) },
             IntegrationLoader("ItemsAdder") { CustomItemsManager.register(CustomItemsItemsAdder()) },
             IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase(this)) },
             IntegrationLoader("ExecutableItems") { CustomItemsManager.register(CustomItemsExecutableItems()) },

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt

@@ -1,5 +1,7 @@
 package com.willfp.eco.internal.spigot.integrations.customitems
 
+import com.willfp.eco.core.Eco
+import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration
 import com.willfp.eco.core.items.CustomItem
 import com.willfp.eco.core.items.Items
@@ -7,16 +9,26 @@ import com.willfp.eco.core.items.TestableItem
 import com.willfp.eco.core.items.provider.ItemProvider
 import com.willfp.eco.util.NamespacedKeyUtils
 import io.th0rgal.oraxen.api.OraxenItems
+import io.th0rgal.oraxen.api.events.OraxenItemsLoadedEvent
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
 
-class CustomItemsOraxen : CustomItemsIntegration {
+class CustomItemsOraxen(
+    private val plugin: EcoPlugin
+) : CustomItemsIntegration, Listener {
     override fun registerProvider() {
-        Items.registerItemProvider(OraxenProvider())
+        plugin.eventManager.registerListener(this)
     }
 
     override fun getPluginName(): String {
         return "Oraxen"
     }
 
+    @EventHandler
+    fun onItemRegister(event: OraxenItemsLoadedEvent) {
+        Items.registerItemProvider(OraxenProvider())
+    }
+
     private class OraxenProvider : ItemProvider("oraxen") {
         override fun provideForKey(key: String): TestableItem? {
             val item = OraxenItems.getItemById(key) ?: return null

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.54.0
+version = 6.54.1
 plugin-name = eco
 kotlin.code.style = official