From f72d3622ca7305b748fc71ac9991e1016941ee0e Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Fri, 26 Jul 2024 18:28:06 +0200 Subject: [PATCH] Add use of color cost. --- .../io/delilaheve/AnvilEventListener.kt | 20 ++++++++++++++++--- .../io/delilaheve/util/ConfigOptions.kt | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt index c574153..5abb6fc 100644 --- a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt +++ b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt @@ -169,21 +169,29 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener { val displayName = ChatColor.stripColor(it.displayName) var inventoryName = ChatColor.stripColor(inventory.renameText) + var sumCost = 0 + var useColor = false if(ConfigOptions.renameColorPossible){ val resultString = StringBuilder(inventoryName) useColor = handleRenamingColor(resultString, player) - if(useColor) inventoryName = resultString.toString() + if(useColor) { + inventoryName = resultString.toString() + + sumCost+= ConfigOptions.useOfColorCost + } } - if ((!useColor && !displayName.contentEquals(inventoryName)) || (useColor && !(it.displayName).contentEquals(inventoryName))) { + if ((!useColor && (!displayName.contentEquals(inventoryName))) || (useColor && !(it.displayName).contentEquals(inventoryName))) { it.setDisplayName(inventoryName) resultItem.itemMeta = it - return ConfigOptions.itemRenameCost + sumCost+= ConfigOptions.itemRenameCost } + + return sumCost } return 0 } @@ -415,8 +423,14 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener { leftItem.itemMeta?.let { leftMeta -> val leftName = leftMeta.displayName output.itemMeta?.let { + // Rename cost if (!leftName.contentEquals(it.displayName)) { repairCost += ConfigOptions.itemRenameCost + + // Color cost + if(it.displayName.contains('ยง')){ + repairCost += ConfigOptions.useOfColorCost + } } } } diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt index 3715e52..80dea06 100644 --- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt +++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt @@ -239,7 +239,7 @@ object ConfigOptions { /** * How many xp should use of color should cost */ - private val useOfColorCost: Int + val useOfColorCost: Int get() { return ConfigHolder.DEFAULT_CONFIG .config