fix durability repair and item naming

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

@@ -15,6 +15,8 @@ object ConfigOptions {
     private const val ALLOW_UNSAFE_PATH = "allow_unsafe"
     // Path for limiting repair cost
     private const val LIMIT_REPAIR_COST = "limit_repair_cost"
+    // Path for repair value limit
+    private const val LIMIT_REPAIR_VALUE = "limit_repair_value"
     // Path for removing repair cost limits
     private const val REMOVE_REPAIR_LIMIT = "remove_repair_limit"
     // Root path for enchantment limits
@@ -33,6 +35,10 @@ object ConfigOptions {
     private const val DEFAULT_ALLOW_UNSAFE = true
     // Default value for limiting repair cost
     private const val DEFAULT_LIMIT_REPAIR = true
+    // Default value for repair cost limit
+    private const val DEFAULT_LIMIT_REPAIR_VALUE = 39
+    // Valid range for repair cost limit
+    private val REPAIR_LIMIT_RANGE = 1..39
     // Default for removing repair cost limits
     private const val DEFAULT_REMOVE_LIMIT = false
     // Valid range for an enchantment limit
@@ -72,6 +78,18 @@ object ConfigOptions {
                 .getBoolean(LIMIT_REPAIR_COST, DEFAULT_LIMIT_REPAIR)
         }
 
+    /**
+     * Value to limit repair costs to
+     */
+    val limitRepairValue: Int
+        get() {
+            return UnsafeEnchants.instance
+                .config
+                .getInt(LIMIT_REPAIR_VALUE, DEFAULT_LIMIT_REPAIR_VALUE)
+                .takeIf { it in REPAIR_LIMIT_RANGE }
+                ?: DEFAULT_LIMIT_REPAIR_VALUE
+        }
+
     /**
      * Whether to remove repair cost limit
      */

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

@@ -19,8 +19,8 @@ object EnchantmentUtil {
     /**
      * Combine 2 sets of enchantments according to our configuration
      */
-    fun MutableMap<Enchantment, Int>.combineWith(
-        other: MutableMap<Enchantment, Int>
+    fun Map<Enchantment, Int>.combineWith(
+        other: Map<Enchantment, Int>
     ) = mutableMapOf<Enchantment, Int>().apply {
         putAll(this@combineWith)
         other.forEach { (enchantment, level) ->

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

@@ -1,17 +1,36 @@
 package io.delilaheve.util
 
 import io.delilaheve.UnsafeEnchants
+import io.delilaheve.util.EnchantmentUtil.calculateValue
+import io.delilaheve.util.ItemUtil.isBook
 import org.bukkit.Material.BOOK
 import org.bukkit.Material.ENCHANTED_BOOK
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.Damageable
 import org.bukkit.inventory.meta.EnchantmentStorageMeta
+import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.inventory.meta.Repairable
+import kotlin.math.min
 
 /**
  * Item manipulation utilities
  */
 object ItemUtil {
 
+    /**
+     * Determine the value of an item for repair
+     *
+     * ToDo - use native repair cost
+     */
+    val ItemStack.repairCost: Int
+        get() {
+            val nativeCost = (itemMeta as? Repairable)?.repairCost
+            val pluginCost = findEnchantments().calculateValue(isBook())
+            UnsafeEnchants.log("Native Cost: $nativeCost; Plugin Cost: $pluginCost")
+            return nativeCost.takeIf { it != 0 } ?: pluginCost
+        }
+
     /**
      * Check if this [ItemStack] is a [BOOK] or [ENCHANTED_BOOK]
      */
@@ -72,6 +91,25 @@ object ItemUtil {
         }
     }
 
+    /**
+     * Set this [ItemStack]s durability from a combination of the
+     * [first] and [second] item's durability values
+     */
+    fun ItemStack.repairFrom(
+        first: ItemStack,
+        second: ItemStack
+    ) {
+        (itemMeta as? Damageable)?.let {
+            val maxDurability = type.maxDurability.toInt()
+            val firstDurability = (first.itemMeta as? Damageable)?.damage ?: 0
+            val secondDurability = (second.itemMeta as? Damageable)?.damage ?: 0
+            var newDurability = firstDurability + secondDurability
+            newDurability = min(maxDurability, newDurability)
+            it.damage = newDurability
+            itemMeta = it as ItemMeta
+        }
+    }
+
     /**
      * Check that this [ItemStack] can merge with the [other]
      *