From 2861238f583917f357fa843f7e44c6308078020d Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 23 Apr 2024 02:24:23 +0200 Subject: [PATCH] Avoid overriding left item name on custom name. fix #8 Also version up for convenience. --- build.gradle.kts | 2 +- src/main/kotlin/io/delilaheve/AnvilEventListener.kt | 5 ++++- src/main/resources/plugin.yml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b2210cc..3e79591 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "xyz.alexcrea" -version = "1.4.1a" +version = "1.4.2a" repositories { mavenCentral() diff --git a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt index 22decff..4138695 100644 --- a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt +++ b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt @@ -9,6 +9,7 @@ import io.delilaheve.util.ItemUtil.isEnchantedBook import io.delilaheve.util.ItemUtil.repairFrom import io.delilaheve.util.ItemUtil.setEnchantmentsUnsafe import io.delilaheve.util.ItemUtil.unitRepair +import org.bukkit.ChatColor import org.bukkit.GameMode import org.bukkit.Material import org.bukkit.entity.Player @@ -161,7 +162,9 @@ class AnvilEventListener : Listener { private fun handleRename(resultItem: ItemStack, inventory: AnvilInventory): Int { // Rename item and add renaming cost resultItem.itemMeta?.let { - if (!it.displayName.contentEquals(inventory.renameText)) { + val displayName = ChatColor.stripColor(it.displayName) + val inventoryName = ChatColor.stripColor(inventory.renameText) + if (!displayName.contentEquals(inventoryName)) { it.setDisplayName(inventory.renameText) resultItem.itemMeta = it return ConfigOptions.itemRenameCost diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d06819b..f41a940 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ main: io.delilaheve.CustomAnvil name: CustomAnvil prefix: "Custom Anvil" -version: 1.4.1a +version: 1.4.2a description: Allow to customise anvil mechanics api-version: 1.18 load: POSTWORLD