nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt

@@ -57,10 +57,8 @@ object PlatformUtil {
         } else {
             val legacyLore = ArrayList<String?>(lore.size)
             for (component in lore) {
-                legacyLore.add(
-                    if (component == null) null
-                    else legacy_mm.serialize(component)
-                )
+                legacyLore.add(if(component == null) null
+                else legacy_mm.serialize(component))
             }
 
             this.lore = legacyLore
@@ -68,23 +66,24 @@ object PlatformUtil {
     }
 
     // Display name
-    private val useCustomName = hasMethod(ItemMeta::class.java, "customName")
+    private val useCustomName = hasMethod(ItemStack::class.java, "customName")
 
     fun ItemMeta.componentDisplayName(): Component? {
         if(useCustomName){
             if(!this.hasCustomName()) return null
             return this.customName()
-        }
+        }else if(isPaper){
+            if(!this.hasDisplayName()) return null
+            return this.displayName()
+        } else {
             if(!this.hasDisplayName()) return null
 
-        return if (isPaper) {
-            this.displayName()
-        } else {
-            legacy_mm.deserialize(this.displayName)
+            val legacy = this.displayName
+            return legacy_mm.deserialize(legacy)
         }
     }
 
-    fun ItemMeta.setComponentDisplayName(component: Component?, fallback: String? = null) {
+    fun ItemMeta.setComponentDisplayName(component: Component?) {
         if(useCustomName){
             this.customName(component)
         }else if(isPaper){
@@ -95,7 +94,7 @@ object PlatformUtil {
                 return
             }
 
-            val legacy = fallback ?: legacy_mm.serialize(component)
+            val legacy = legacy_mm.serialize(component)
             this.setDisplayName(legacy)
         }
     }

src/main/kotlin/io/delilaheve/util/ItemUtil.kt

@@ -82,6 +82,6 @@ object ItemUtil {
      * The two items should either be the same type, or, the [other] is a book
      */
     fun ItemStack.canMergeWith(
-        other: ItemStack
-    ) = customType == other.customType || (other.isEnchantedBook())
+        other: ItemStack?
+    ) = (other != null) && (customType == other.customType || (other.isEnchantedBook()))
 }

src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt

@@ -6,7 +6,6 @@ import io.delilaheve.util.EnchantmentUtil.combineWith
 import io.delilaheve.util.ItemUtil.isEnchantedBook
 import io.delilaheve.util.ItemUtil.repairFrom
 import io.delilaheve.util.ItemUtil.unitRepair
-import net.kyori.adventure.text.Component
 import org.bukkit.ChatColor
 import org.bukkit.Material
 import org.bukkit.entity.HumanEntity
@@ -17,7 +16,6 @@ import org.bukkit.inventory.view.AnvilView
 import org.bukkit.persistence.PersistentDataType
 import xyz.alexcrea.cuanvil.api.EnchantmentApi
 import xyz.alexcrea.cuanvil.dependency.DependencyManager
-import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setComponentDisplayName
 import xyz.alexcrea.cuanvil.dialog.AnvilRenameDialog
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment
 import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe
@@ -140,12 +138,11 @@ object AnvilMergeLogic {
     private fun handleRename(resultItem: ItemStack, view: AnvilView, player: HumanEntity): Int {
         // Can be null
         var renameText = ChatColor.stripColor(view.renameText)
-        var component: Component? = null
 
         var sumCost = 0
         var useColor = false
         if (ConfigOptions.renameColorPossible && renameText != null) {
-            component = AnvilColorUtil.handleColor(
+            val component = AnvilColorUtil.handleColor(
                 renameText,
                 AnvilColorUtil.renamePermission(player)
             )
@@ -172,11 +169,7 @@ object AnvilMergeLogic {
                         renameText == CasedStringUtil.snakeToUpperSpacedCase(resultItem.type.name.lowercase())
                         )
             ) {
-                if (component == null)
-                    component = if (renameText == null || renameText.isEmpty()) null
-                    else Component.text(renameText)
-                it.setComponentDisplayName(component, renameText)
-
+                it.setDisplayName(renameText)
                 processDialogPCD(it, player)
                 resultItem.itemMeta = it
 

src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt

@@ -31,7 +31,6 @@ import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_INPUT_
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_INPUT_RIGHT
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT_SLOT
 import xyz.alexcrea.cuanvil.util.CustomRecipeUtil
-import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir
 import xyz.alexcrea.cuanvil.util.MiniMessageUtil
 import xyz.alexcrea.cuanvil.util.anvil.AnvilLoreEditUtil
 import xyz.alexcrea.cuanvil.util.anvil.AnvilXpUtil
@@ -93,7 +92,7 @@ class AnvilResultListener : Listener {
         }
 
         // Rename
-        if (rightItem.isAir) {
+        if (rightItem == null) {
             val result = AnvilMergeLogic.doRenaming(view, player, leftItem)
             if (result.isEmpty()) return
 
@@ -107,7 +106,7 @@ class AnvilResultListener : Listener {
         }
 
         // Merge
-        val canMerge = leftItem.canMergeWith(rightItem!!)
+        val canMerge = leftItem.canMergeWith(rightItem)
         if (canMerge) {
             val result = AnvilMergeLogic.doMerge(view, player, leftItem, rightItem)