1.21 cleanup and fix

also random cleanup

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

@@ -16,6 +16,7 @@ import org.bukkit.inventory.AnvilInventory
 import org.bukkit.inventory.InventoryView
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.inventory.view.AnvilView
 import org.bukkit.persistence.PersistentDataType
 import xyz.alexcrea.cuanvil.dependency.DependencyManager
 import xyz.alexcrea.cuanvil.dialog.AnvilRenameDialog
@@ -32,6 +33,7 @@ import xyz.alexcrea.cuanvil.util.anvil.AnvilXpUtil
 import xyz.alexcrea.cuanvil.util.config.LoreEditType
 import xyz.alexcrea.cuanvil.util.dialog.AnvilRenameDialogUtil
 
+@Suppress("UnstableApiUsage")
 object AnvilMergeLogic {
 
     open class AnvilResult {
@@ -104,7 +106,7 @@ object AnvilMergeLogic {
     ): AnvilResult {
         val resultItem = DependencyManager.cloneItem(player, first)
         val cost = AnvilCost()
-        cost.rename = handleRename(resultItem, inventory, player)
+        cost.rename = handleRename(resultItem, view, player)
 
         // Test/stop if nothing changed.
         if (first == resultItem) {
@@ -137,9 +139,9 @@ object AnvilMergeLogic {
         }
     }
 
-    private fun handleRename(resultItem: ItemStack, inventory: AnvilInventory, player: HumanEntity): Int {
+    private fun handleRename(resultItem: ItemStack, view: AnvilView, player: HumanEntity): Int {
         // Can be null
-        var renameText = ChatColor.stripColor(inventory.renameText)
+        var renameText = ChatColor.stripColor(view.renameText)
 
         var sumCost = 0
         var useColor = false
@@ -217,7 +219,7 @@ object AnvilMergeLogic {
         // As calculatePenalty edit result, we need to calculate penalty after checking equality
         cost.workPenalty = AnvilXpUtil.calculatePenalty(first, second, resultItem, AnvilUseType.MERGE)
         // Calculate rename cost
-        cost.rename = handleRename(resultItem, inventory, player)
+        cost.rename = handleRename(resultItem, view, player)
 
         val result =
             DependencyManager.tryTreatAnvilResult(view, inventory, player, resultItem, AnvilUseType.MERGE, cost)
@@ -286,7 +288,7 @@ object AnvilMergeLogic {
     ): UnitRepairResult {
         val resultItem = DependencyManager.cloneItem(player, first)
         val cost = AnvilCost()
-        cost.rename = handleRename(resultItem, inventory, player)
+        cost.rename = handleRename(resultItem, view, player)
 
         val repairAmount = resultItem.unitRepair(second.amount, unitRepairAmount)
         if (repairAmount > 0)

src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt

@@ -15,8 +15,10 @@ abstract class CASubCommand: CommandExecutor {
         args: Array<out String>
     ): Boolean {
         if (!alreadySaid) {
-            sender.sendMessage(ChatColor.RED.toString() +
+            sender.sendMessage(
-                    "Please not that this command will be replaced as a subcommand of `/customanvil` or `/ca`")
+                ChatColor.RED.toString() +
+                        "Please not that this command will be replaced as a subcommand of `/customanvil` or `/ca`"
+            )
             alreadySaid = true
         }
 
@@ -27,7 +29,8 @@ abstract class CASubCommand: CommandExecutor {
         sender: CommandSender,
         cmd: Command,
         cmdstr: String,
-        args: Array<out String>): Boolean
+        args: Array<out String>
+    ): Boolean
 
     open fun allowed(sender: CommandSender): Boolean {
         return true
@@ -36,7 +39,8 @@ abstract class CASubCommand: CommandExecutor {
     open fun tabCompleter(
         sender: CommandSender,
         args: Array<out String>,
-        list: MutableList<String>) {
+        list: MutableList<String>
+    ) {
     }
 
     open fun description(): String {

src/main/kotlin/xyz/alexcrea/cuanvil/command/CustomAnvilCommand.kt

@@ -7,7 +7,6 @@ import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 import org.bukkit.command.TabCompleter
 import xyz.alexcrea.cuanvil.util.MetricsUtil
-import java.util.ArrayList
 
 class CustomAnvilCommand(plugin: CustomAnvil) : CommandExecutor, TabCompleter {
 

src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt

@@ -83,7 +83,8 @@ class DiagnosticExecutor: CASubCommand() {
     override fun tabCompleter(
         sender: CommandSender,
         args: Array<out String>,
-        list: MutableList<String>) {
+        list: MutableList<String>
+    ) {
         if (!allowed(sender)) return
 
         val map = fetchParameters(args)
@@ -122,7 +123,8 @@ class DiagnosticExecutor: CASubCommand() {
 
         if (sender is HumanEntity) {
             if (hasError)
-                sender.spigot().sendMessage(TextComponent(ChatColor.RED.toString() + "There was an error running the diagnostic"))
+                sender.spigot()
+                    .sendMessage(TextComponent(ChatColor.RED.toString() + "There was an error running the diagnostic"))
             val message = TextComponent(ChatColor.GREEN.toString() + "Click to copy diagnostic data")
 
             message.clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, stb.toString())
@@ -323,11 +325,13 @@ class DiagnosticExecutor: CASubCommand() {
             map[enchant.key.namespace] = map.getOrDefault(enchant.key.namespace, 0) + 1
         }
 
-        stb.append("\nNamespaces: ${
+        stb.append(
+            "\nNamespaces: ${
             map.entries.stream()
                 .map { (key, value) -> "$key ($value)" }
                 .reduce { a, b -> "$a, $b" }.get()
-        }")
+        }"
+        )
 
     }
 
@@ -337,7 +341,6 @@ class DiagnosticExecutor: CASubCommand() {
         stb.append("\n\nLast stack trace: ${e.stackTraceToString()}")
 
 
-
     }
 
 }

src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt

@@ -10,10 +10,12 @@ import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions
 
 class EditConfigExecutor : CASubCommand() {
 
-    override fun executeCommand(sender: CommandSender,
+    override fun executeCommand(
+        sender: CommandSender,
         cmd: Command,
         cmdstr: String,
-                                args: Array<out String>): Boolean {
+        args: Array<out String>
+    ): Boolean {
         if (sender !is HumanEntity) return false
 
         if (!allowed(sender)) {

src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt

@@ -8,10 +8,12 @@ class HelpExecutor: CASubCommand() {
 
     lateinit var commands: ImmutableMap<String, CASubCommand>
 
-    override fun executeCommand(sender: CommandSender,
+    override fun executeCommand(
+        sender: CommandSender,
         cmd: Command,
         cmdstr: String,
-                                args: Array<out String>): Boolean {
+        args: Array<out String>
+    ): Boolean {
 
         val stb = StringBuilder("List of available commands:")
         for ((key, cmd) in commands) {

src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt

@@ -3,7 +3,6 @@ package xyz.alexcrea.cuanvil.command
 import io.delilaheve.CustomAnvil
 import org.bukkit.Bukkit
 import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 import xyz.alexcrea.cuanvil.api.event.CAConfigReadyEvent
 import xyz.alexcrea.cuanvil.config.ConfigHolder
@@ -13,10 +12,12 @@ import xyz.alexcrea.cuanvil.update.UpdateHandler
 
 class ReloadExecutor : CASubCommand() {
 
-    override fun executeCommand(sender: CommandSender,
+    override fun executeCommand(
+        sender: CommandSender,
         cmd: Command,
         cmdstr: String,
-                           args: Array<out String>): Boolean {
+        args: Array<out String>
+    ): Boolean {
         if (!allowed(sender)) {
             sender.sendMessage("§cYou do not have permission to reload the config")
             return false

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt

@@ -35,6 +35,7 @@ import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT
 import xyz.alexcrea.cuanvil.util.MetricsUtil.trackError
 import java.util.logging.Level
 
+@Suppress("UnstableApiUsage")
 object DependencyManager {
 
     lateinit var scheduler: TaskScheduler

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/MinecraftVersionUtil.kt

@@ -26,7 +26,9 @@ object MinecraftVersionUtil {
             }
         }
 
-    val isTooNewForSpigot: Boolean get() {
+    val isTooNewForSpigot: Boolean
+        get() {
+
             return UpdateUtils.currentMinecraftVersion().major != 1
         }
 

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt

@@ -64,11 +64,11 @@ class GenericExternGuiTester {
     }
 
     // Try if were in another plugin anvil inventory
-    fun testIfGui(inventory: InventoryView): Boolean {
+    fun testIfGui(view: InventoryView): Boolean {
         // In case we are in a test environment
         if(isInTest()) return false
 
-        val clazz = getContainerClass(inventory) ?: return false
+        val clazz = getContainerClass(view) ?: return false
 
         val clazzName = clazz.name
         if(!PlatformUtil.isPaper){

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt

@@ -3,7 +3,7 @@ package xyz.alexcrea.cuanvil.dependency.packet
 import org.bukkit.Bukkit
 import xyz.alexcrea.cuanvil.dependency.DependencyManager
 import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
-import xyz.alexcrea.cuanvil.dependency.packet.versions.*
+import xyz.alexcrea.cuanvil.dependency.packet.versions.PaperPacketManager
 import xyz.alexcrea.cuanvil.update.UpdateUtils
 
 object PacketManagerSelector {

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/DisenchantmentDependency.kt

@@ -21,6 +21,7 @@ import xyz.alexcrea.cuanvil.util.anvil.AnvilXpUtil
 import java.util.logging.Level
 import kotlin.reflect.KClass
 
+@Suppress("UnstableApiUsage")
 class DisenchantmentDependency {
 
     init {

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/EnchantmentSquaredDependency.kt

@@ -30,7 +30,8 @@ class EnchantmentSquaredDependency(private val enchantmentSquaredPlugin: Plugin)
                     "disable_anvil, " +
                     "incompatible_vanilla_enchantments, " +
                     "incompatible_custom_enchantments and max_level " +
-                    "configuration values.")
+                    "configuration values."
+        )
     }
 
     fun disableAnvilListener() {
@@ -69,8 +70,8 @@ class EnchantmentSquaredDependency(private val enchantmentSquaredPlugin: Plugin)
     fun getEnchantmentsSquared(item: ItemStack, enchantments: MutableMap<CAEnchantment, Int>) {
         val customEnchants = CustomEnchantManager.getInstance().getItemsEnchantsFromPDC(item)
 
-        customEnchants.forEach{
+        customEnchants.forEach { (enchantment, level) ->
-                (enchantment, level ) -> enchantments[getWrappedEnchant(enchantment)] = level
+            enchantments[getWrappedEnchant(enchantment)] = level
         }
 
     }
@@ -78,6 +79,7 @@ class EnchantmentSquaredDependency(private val enchantmentSquaredPlugin: Plugin)
     fun getKeyFromEnchant(enchant: CustomEnchant): NamespacedKey {
         return NamespacedKey.fromString(enchant.type.lowercase(Locale.getDefault()), this.enchantmentSquaredPlugin)!!
     }
+
     private fun getWrappedEnchant(enchant: CustomEnchant): CAEnchantment {
         return CAEnchantment.getByKey(getKeyFromEnchant(enchant))!!
     }

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt

@@ -17,10 +17,10 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Method
 import su.nightexpress.excellentenchants.api.EnchantRegistry as V5EnchantRegistry
 import su.nightexpress.excellentenchants.enchantment.impl.universal.CurseOfFragilityEnchant as LegacyCurseOfFragilityEnchant
-import su.nightexpress.excellentenchants.manager.listener.AnvilListener as V5AnvilListener
 import su.nightexpress.excellentenchants.enchantment.listener.AnvilListener as PreV5AnvilListener
 import su.nightexpress.excellentenchants.enchantment.listener.EnchantAnvilListener as LegacyAnvilListener
 import su.nightexpress.excellentenchants.enchantment.registry.EnchantRegistry as LegacyEnchantRegistry
+import su.nightexpress.excellentenchants.manager.listener.AnvilListener as V5AnvilListener
 import su.nightexpress.excellentenchants.registry.EnchantRegistry as PreV5EnchantRegistry
 
 // I don't like that I need to support older version. if I could just drop older support it would be sooo nice
@@ -173,6 +173,7 @@ class ExcellentEnchantsDependency {
             ListenerVersion.V5,
             ListenerVersion.V5_4,
                 -> this.usedAnvilListener = v5AnvilListener!!
+
             ListenerVersion.PRE_V5 -> this.usedAnvilListener = preV5AnvilListener!!
             ListenerVersion.LEGACY -> this.usedAnvilListener = legacyAnvilListener!!
             null -> {}
@@ -240,6 +241,7 @@ class ExcellentEnchantsDependency {
                 ListenerVersion.V5_3,
                 ListenerVersion.V5_4,
                     -> v5AnvilListener!!.onClickAnvil(event)
+
                 ListenerVersion.PRE_V5 -> preV5AnvilListener!!.onClickAnvil(event)
                 ListenerVersion.LEGACY -> legacyAnvilListener!!.onClickAnvil(event)
                 null -> {}

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/GenericPluginDependency.kt

@@ -35,7 +35,8 @@ open class GenericPluginDependency(protected open val plugin: Plugin, private va
 
     protected open fun fillPostAnvil(
         postAnvil: ArrayList<RegisteredListener>,
-        preAnvil: ArrayList<RegisteredListener>) {
+        preAnvil: ArrayList<RegisteredListener>
+    ) {
 
     }
 

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/HavenBagsDependency.kt

@@ -13,6 +13,7 @@ import xyz.alexcrea.cuanvil.anvil.AnvilCost
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
 import xyz.alexcrea.cuanvil.util.anvil.AnvilXpUtil
 
+@Suppress("UnstableApiUsage")
 class HavenBagsDependency {
 
     init {

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ToolStatsDependency.kt

@@ -5,7 +5,6 @@ import lol.hyper.toolstats.tools.ItemChecker
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.Plugin
-import org.bukkit.plugin.RegisteredListener
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
 import java.lang.reflect.Method
 

src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt

@@ -18,6 +18,7 @@ class EnchantConflictGroup(
     fun addEnchantment(enchant: CAEnchantment) {
         enchantments.add(enchant)
     }
+
     fun addEnchantments(enchants: List<CAEnchantment>) {
         enchantments.addAll(enchants)
     }

src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt

@@ -10,7 +10,6 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantment
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry
 import xyz.alexcrea.cuanvil.util.MaterialUtil.customType
 import java.util.*
-import kotlin.collections.set
 
 class EnchantConflictManager {
 
@@ -140,7 +139,11 @@ class EnchantConflictManager {
         return conflict
     }
 
-    private fun fetchConditionalRestriction(restrictions: MutableMap<CAEnchantment, Int>, section: ConfigurationSection?, conflictName: String) {
+    private fun fetchConditionalRestriction(
+        restrictions: MutableMap<CAEnchantment, Int>,
+        section: ConfigurationSection?,
+        conflictName: String
+    ) {
         if (section == null) return
         for (enchantName in section.getKeys(false)) {
             val enchants = getEnchantByIdentifier(enchantName)

src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt

@@ -1,7 +1,6 @@
 package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.NamespacedKey
-import java.util.*
 
 class ExcludeGroup(name: String) : AbstractMaterialGroup(name) {
 

src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt

@@ -1,8 +1,6 @@
 package xyz.alexcrea.cuanvil.group
 
-import org.bukkit.Material
 import org.bukkit.NamespacedKey
-import java.util.*
 
 class IncludeGroup(name: String) : AbstractMaterialGroup(name) {
     override fun createDefaultSet(): MutableSet<NamespacedKey> {

src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt

@@ -112,8 +112,7 @@ class ItemGroupManager {
                 if (!groupMap.containsKey(groupName)) {
                     if (!config.isConfigurationSection(groupName)) continue
                     createGroup(config, keys, groupName)
-            }
+                } else groupMap[groupName]!!
-            else groupMap[groupName]!!
 
             // Avoid self reference or it will create an infinite loop
             if (otherGroup.isReferencing(group)) {

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

@@ -9,6 +9,7 @@ import org.bukkit.inventory.view.AnvilView
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
 import xyz.alexcrea.cuanvil.util.dialog.AnvilRenameDialogUtil
 
+@Suppress("UnstableApiUsage")
 class AnvilCloseListener(private val packetManager: PacketManager) : Listener {
 
     @EventHandler

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

@@ -11,10 +11,9 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.ClickType
 import org.bukkit.event.inventory.InventoryClickEvent
-import org.bukkit.inventory.AnvilInventory
-import org.bukkit.inventory.InventoryView
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.BookMeta
+import org.bukkit.inventory.view.AnvilView
 import xyz.alexcrea.cuanvil.anvil.AnvilCost
 import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic
 import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic.AnvilResult
@@ -37,6 +36,7 @@ import java.util.*
 import java.util.concurrent.atomic.AtomicReference
 import kotlin.math.min
 
+@Suppress("UnstableApiUsage")
 class AnvilResultListener : Listener {
 
     companion object {
@@ -51,7 +51,7 @@ class AnvilResultListener : Listener {
     @EventHandler(ignoreCancelled = true)
     fun anvilExtractionCheck(event: InventoryClickEvent) {
         val player = event.whoClicked as? Player ?: return
-        val inventory = event.inventory as? AnvilInventory ?: return
+        val view = event.view as? AnvilView ?: return
         val view = event.view
 
         if (event.rawSlot != ANVIL_OUTPUT_SLOT) {
@@ -59,17 +59,17 @@ class AnvilResultListener : Listener {
         }
 
         // Test if the event should bypass custom anvil.
-        if (DependencyManager.tryClickAnvilResultBypass(event, inventory)) return
+        if (DependencyManager.tryClickAnvilResultBypass(event, view)) return
 
         if (!player.hasPermission(CustomAnvil.affectedByPluginPermission)) return
 
-        val output = inventory.getItem(ANVIL_OUTPUT_SLOT) ?: return
+        val output = view.getItem(ANVIL_OUTPUT_SLOT) ?: return
-        val leftItem = inventory.getItem(ANVIL_INPUT_LEFT) ?: return
+        val leftItem = view.getItem(ANVIL_INPUT_LEFT) ?: return
-        val rightItem = inventory.getItem(ANVIL_INPUT_RIGHT)
+        val rightItem = view.getItem(ANVIL_INPUT_RIGHT)
 
         // Deny by default. allow if working
         event.result = Event.Result.DENY
-        if (GameMode.CREATIVE != player.gameMode && inventory.repairCost >= inventory.maximumRepairCost) {
+        if (GameMode.CREATIVE != player.gameMode && view.repairCost >= view.maximumRepairCost) {
             return
         }
 
@@ -77,14 +77,14 @@ class AnvilResultListener : Listener {
         val customRecipeResult = AnvilMergeLogic.testCustomRecipe(view, inventory, player, leftItem, rightItem)
         if (!customRecipeResult.isEmpty()) {
             onCustomCraft(
-                event, player, inventory,
+                event, player, view,
                 leftItem, rightItem, customRecipeResult
             )
             return
         }
 
         // Do not continue if there was no change
-        if ((output == inventory.getItem(ANVIL_INPUT_LEFT))) {
+        if ((output == view.getItem(ANVIL_INPUT_LEFT))) {
             return
         }
 
@@ -94,7 +94,7 @@ class AnvilResultListener : Listener {
             if (result.isEmpty()) return
 
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 null, 0,
                 null, 0,
                 result
@@ -108,7 +108,7 @@ class AnvilResultListener : Listener {
             val result = AnvilMergeLogic.doMerge(view, inventory, player, leftItem, rightItem)
 
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 null, 0,
                 null, 0,
                 result
@@ -123,7 +123,7 @@ class AnvilResultListener : Listener {
         )
         if (!unitRepairResult.isEmpty()) {
             onUnitRepairExtract(
-                rightItem, event, player, inventory,
+                rightItem, event, player, view,
                 unitRepairResult
             )
             return
@@ -133,9 +133,9 @@ class AnvilResultListener : Listener {
         val loreResult = AnvilMergeLogic.testLoreEdit(player, leftItem, rightItem)
         if (!loreResult.isEmpty()) {
             if (loreResult.type.isBook)
-                handleBookLoreEdit(event, inventory, player, leftItem, rightItem, loreResult)
+                handleBookLoreEdit(event, view, player, leftItem, rightItem, loreResult)
             else
-                handlePaperLoreEdit(event, inventory, player, leftItem, rightItem, loreResult)
+                handlePaperLoreEdit(event, view, player, leftItem, rightItem, loreResult)
             return
         }
     }
@@ -143,7 +143,7 @@ class AnvilResultListener : Listener {
     private fun onCustomCraft(
         event: InventoryClickEvent,
         player: Player,
-        inventory: AnvilInventory,
+        view: AnvilView,
         leftItem: ItemStack,
         rightItem: ItemStack?,
         result: CustomCraftResult,
@@ -181,7 +181,7 @@ class AnvilResultListener : Listener {
         if (event.click != ClickType.MIDDLE &&
             !handleCustomCraftClick(
                 event,
-                inventory,
+                view,
                 player,
                 leftItem,
                 rightItem,
@@ -199,7 +199,7 @@ class AnvilResultListener : Listener {
 
     private fun handleCustomCraftClick(
         event: InventoryClickEvent,
-        inventory: AnvilInventory, player: Player,
+        view: AnvilView, player: Player,
         leftItem: ItemStack, rightItem: ItemStack?,
         result: CustomCraftResult
     ): Boolean {
@@ -211,11 +211,11 @@ class AnvilResultListener : Listener {
             if (recipe.rightItem == null) return false// in case it changed
 
             rightItem.amount -= amount * recipe.rightItem!!.amount
-            inventory.setItem(ANVIL_INPUT_RIGHT, rightItem)
+            view.setItem(ANVIL_INPUT_RIGHT, rightItem)
         }
 
         leftItem.amount -= amount * recipe.leftItem!!.amount
-        inventory.setItem(ANVIL_INPUT_LEFT, leftItem)
+        view.setItem(ANVIL_INPUT_LEFT, leftItem)
 
         removeCustomCraftCost(player, result)
 
@@ -224,17 +224,15 @@ class AnvilResultListener : Listener {
 
         CustomAnvil.verboseLog("new amount is $newAmount")
         if (newAmount <= 0 || recipe.exactCount) {
-            inventory.setItem(ANVIL_OUTPUT_SLOT, null)
+            view.setItem(ANVIL_OUTPUT_SLOT, null)
         } else {
             val resultItem: ItemStack = recipe.resultItem!!.clone()
             resultItem.amount *= newAmount
 
             val newXp = newAmount * newAmount
 
-            inventory.repairCost = newXp
+            view.repairCost = newXp
-            event.view.setProperty(InventoryView.Property.REPAIR_COST, newXp)
+            view.setItem(ANVIL_OUTPUT_SLOT, resultItem)
-
-            inventory.setItem(ANVIL_OUTPUT_SLOT, resultItem)
 
             player.updateInventory()
         }
@@ -291,7 +289,7 @@ class AnvilResultListener : Listener {
     private fun extractAnvilResult(
         event: InventoryClickEvent,
         player: Player,
-        inventory: AnvilInventory,
+        view: AnvilView,
         leftItem: ItemStack?,
         leftRemoveCount: Int,
         rightItem: ItemStack?,
@@ -305,7 +303,7 @@ class AnvilResultListener : Listener {
         event.isCancelled = true
         val cost = result.cost
 
-        processCost(inventory, player, cost)
+        processCost(view, player, cost)
         if (!cost.valid && player.gameMode != GameMode.CREATIVE) return false
 
         // Where should we get the item
@@ -318,12 +316,12 @@ class AnvilResultListener : Listener {
 
             // We remove what should be removed
             if (leftItem != null) leftItem.amount -= leftRemoveCount
-            inventory.setItem(ANVIL_INPUT_LEFT, leftItem)
+            view.setItem(ANVIL_INPUT_LEFT, leftItem)
 
             if (rightItem != null) rightItem.amount -= rightRemoveCount
-            inventory.setItem(ANVIL_INPUT_RIGHT, rightItem)
+            view.setItem(ANVIL_INPUT_RIGHT, rightItem)
 
-            inventory.setItem(ANVIL_OUTPUT_SLOT, null)
+            view.setItem(ANVIL_OUTPUT_SLOT, null)
 
         }
 
@@ -338,7 +336,7 @@ class AnvilResultListener : Listener {
         return true
     }
 
-    private fun processCost(inventory: AnvilInventory, player: Player, cost: AnvilCost) {
+    private fun processCost(view: AnvilView, player: Player, cost: AnvilCost) {
         var sum = cost.repair
 
         if (
@@ -356,7 +354,7 @@ class AnvilResultListener : Listener {
             if (!EconomyManager.economy!!.has(player, cost.asMonetaryCost()))
                 cost.valid = false
         } else {
-            if ((inventory.maximumRepairCost <= sum)
+            if ((view.maximumRepairCost <= sum)
                 || (player.level < sum)
             ) cost.valid = false
         }
@@ -366,12 +364,12 @@ class AnvilResultListener : Listener {
         rightItem: ItemStack,
         event: InventoryClickEvent,
         player: Player,
-        inventory: AnvilInventory,
+        view: AnvilView,
         result: UnitRepairResult,
     ) {
         // We give the item manually
         extractAnvilResult(
-            event, player, inventory,
+            event, player, view,
             null, 0,
             rightItem, result.repairAmount,
             result
@@ -380,21 +378,21 @@ class AnvilResultListener : Listener {
 
     private fun handleBookLoreEdit(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         leftItem: ItemStack,
         rightItem: ItemStack,
         result: LoreEditResult
     ) {
         if (result.type.isAppend)
-            handleBookLoreAppend(event, inventory, player, rightItem, result)
+            handleBookLoreAppend(event, view, player, rightItem, result)
         else
-            handleBookLoreRemove(event, inventory, player, leftItem, rightItem, result)
+            handleBookLoreRemove(event, view, player, leftItem, rightItem, result)
     }
 
     private fun handleBookLoreAppend(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         rightItem: ItemStack,
         result: LoreEditResult
@@ -412,7 +410,7 @@ class AnvilResultListener : Listener {
         }
 
         extractAnvilResult(
-            event, player, inventory,
+            event, player, view,
             null, 0,
             clearedBook, 0,
             result
@@ -421,7 +419,7 @@ class AnvilResultListener : Listener {
 
     private fun handleBookLoreRemove(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         leftItem: ItemStack,
         rightItem: ItemStack,
@@ -457,7 +455,7 @@ class AnvilResultListener : Listener {
         }
 
         extractAnvilResult(
-            event, player, inventory,
+            event, player, view,
             null, 0,
             rightCopy, 0,
             result
@@ -466,21 +464,21 @@ class AnvilResultListener : Listener {
 
     private fun handlePaperLoreEdit(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         leftItem: ItemStack,
         rightItem: ItemStack,
         result: LoreEditResult
     ) {
         if (result.type.isAppend)
-            handlePaperLoreAppend(event, inventory, player, rightItem, result)
+            handlePaperLoreAppend(event, view, player, rightItem, result)
         else
-            handlePaperLoreRemove(event, inventory, player, leftItem, rightItem, result)
+            handlePaperLoreRemove(event, view, player, leftItem, rightItem, result)
     }
 
     private fun handlePaperLoreAppend(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         rightItem: ItemStack,
         result: LoreEditResult
@@ -505,14 +503,14 @@ class AnvilResultListener : Listener {
 
         if (rightItem.amount > 1) {
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 paperCopy, 0,
                 rightItem, 1,
                 result
             )
         } else {
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 null, 0,
                 paperCopy, 0,
                 result
@@ -522,7 +520,7 @@ class AnvilResultListener : Listener {
 
     private fun handlePaperLoreRemove(
         event: InventoryClickEvent,
-        inventory: AnvilInventory,
+        view: AnvilView,
         player: Player,
         leftItem: ItemStack,
         rightItem: ItemStack,
@@ -557,14 +555,14 @@ class AnvilResultListener : Listener {
 
         if (rightItem.amount > 1) {
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 rightClone, 0,
                 rightItem, 1,
                 result
             )
         } else {
             extractAnvilResult(
-                event, player, inventory,
+                event, player, view,
                 null, 0,
                 rightClone, 0,
                 result

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

@@ -41,9 +41,10 @@ class ChatEventListener : Listener {
         // sync callback with default server thread
         DependencyManager.scheduler.scheduleOnEntity(
             CustomAnvil.instance, player,
-            Runnable {
+            {
                 eventCallback.accept(event.message)
-        }, 0L)
+            }, 0L
+        )
     }
 
 }

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

@@ -1,6 +1,5 @@
 package xyz.alexcrea.cuanvil.listener
 
-import com.github.stefvanschie.inventoryframework.util.InventoryViewUtil
 import io.delilaheve.CustomAnvil
 import io.delilaheve.util.ConfigOptions
 import io.delilaheve.util.ItemUtil.canMergeWith
@@ -16,6 +15,7 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.EnchantmentStorageMeta
 import org.bukkit.inventory.meta.ItemMeta
 import xyz.alexcrea.cuanvil.anvil.AnvilCost
+import org.bukkit.inventory.view.AnvilView
 import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic.AnvilResult
 import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic.doMerge
 import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic.doRenaming
@@ -30,6 +30,7 @@ import xyz.alexcrea.cuanvil.util.dialog.AnvilRenameDialogUtil
 /**
  * Listener for anvil events
  */
+@Suppress("UnstableApiUsage")
 class PrepareAnvilListener : Listener {
 
     companion object {
@@ -48,9 +49,8 @@ class PrepareAnvilListener : Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     fun anvilCombineCheck(event: PrepareAnvilEvent) {
         val view = event.view
-        val inventory = event.inventory
+        val player = view.player
 
-        val player = InventoryViewUtil.getInstance().getPlayer(view)
         if (player !is Player) return
 
         tryRenameDialog(player, event)
@@ -58,12 +58,12 @@ class PrepareAnvilListener : Listener {
         // Test if custom anvil is bypassed before immutability test
         if (DependencyManager.earlyTryEventPreAnvilBypass(event, player)) {
             // even if we got bypassed we still want to set price
-            AnvilXpUtil.setAnvilInvCost(inventory, view, player, AnvilCost(event.inventory.repairCost))
+            AnvilXpUtil.setAnvilInvCost(view, player, AnvilCost(view.repairCost))
             return
         }
 
-        val first = inventory.getItem(ANVIL_INPUT_LEFT)
+        val first = view.getItem(ANVIL_INPUT_LEFT)
-        val second = inventory.getItem(ANVIL_INPUT_RIGHT)
+        val second = view.getItem(ANVIL_INPUT_RIGHT)
 
         if (IS_EMPTY_TEST) {
             IS_EMPTY_TEST = false
@@ -86,7 +86,7 @@ class PrepareAnvilListener : Listener {
         // Test if the event should bypass custom anvil.
         if (DependencyManager.tryEventPreAnvilBypass(event, player)) {
             // even if we got bypassed we still want to set price
-            AnvilXpUtil.setAnvilInvCost(inventory, view, player, AnvilCost(event.inventory.repairCost))
+            AnvilXpUtil.setAnvilInvCost(view, player, AnvilCost(view.repairCost))
             return
         }
 
@@ -100,8 +100,8 @@ class PrepareAnvilListener : Listener {
         view: InventoryView, //TODO use anvil view
         inventory: AnvilInventory,
         player: Player,
-        first: ItemStack?, second: ItemStack?) : AnvilResult
+        first: ItemStack?, second: ItemStack?
-    {
+    ): AnvilResult {
         if (first == null)
             return AnvilResult.EMPTY
 
@@ -175,7 +175,7 @@ class PrepareAnvilListener : Listener {
             AnvilXpUtil.onNoResult(player, event.view)
             return
         }
-        AnvilXpUtil.setAnvilInvCost(event.inventory, event.view, player, result.cost, result.ignoreXpRules)
+        AnvilXpUtil.setAnvilInvCost(event.view, player, result.cost, result.ignoreXpRules)
     }
 
 }

src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt

@@ -1,6 +1,5 @@
 package xyz.alexcrea.cuanvil.util
 
-import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.NamespacedKey
 import org.bukkit.inventory.ItemStack

src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilXpUtil.kt

@@ -9,10 +9,10 @@ import org.bukkit.GameMode
 import org.bukkit.NamespacedKey
 import org.bukkit.entity.HumanEntity
 import org.bukkit.entity.Player
-import org.bukkit.inventory.AnvilInventory
 import org.bukkit.inventory.InventoryView
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.Repairable
+import org.bukkit.inventory.view.AnvilView
 import org.bukkit.persistence.PersistentDataType
 import xyz.alexcrea.cuanvil.anvil.AnvilCost
 import xyz.alexcrea.cuanvil.anvil.AnvilUseType
@@ -23,6 +23,7 @@ import xyz.alexcrea.cuanvil.group.ConflictType
 import xyz.alexcrea.cuanvil.util.AnvilTitleUtil
 import xyz.alexcrea.cuanvil.util.dialog.AnvilRenameDialogUtil
 
+@Suppress("UnstableApiUsage")
 object AnvilXpUtil {
 
     const val EXCLUSIVE_PENALTY_PREFIX = "repair_cost"
@@ -31,17 +32,16 @@ object AnvilXpUtil {
      * Display the required cost (either as xp or as )
      */
     fun setAnvilInvCost(
-        inventory: AnvilInventory,
+        view: AnvilView,
-        view: InventoryView,
         player: Player,
         cost: AnvilCost,
         ignoreRules: Boolean = false
     ) {
         if (ConfigOptions.shouldUseMoney(player)) {
             cost.isMonetary = true
-            setAnvilPrice(inventory, view, player, cost)
+            setAnvilPrice(view, player, cost)
         } else
-            setAnvilInvXp(inventory, view, player, cost.filteredXpCost(ignoreRules), ignoreRules)
+            setAnvilInvXp(view, player, cost.filteredXpCost(ignoreRules), ignoreRules)
     }
 
     fun maximumXpCost(ignoreRules: Boolean = false): Int {
@@ -56,8 +56,7 @@ object AnvilXpUtil {
      * Display xp needed for the work on the anvil inventory
      */
     private fun setAnvilInvXp(
-        inventory: AnvilInventory,
+        view: AnvilView,
-        view: InventoryView,
         player: HumanEntity,
         anvilCost: Int,
         ignoreRules: Boolean = false
@@ -65,8 +64,8 @@ object AnvilXpUtil {
         val maximumRepairCost = maximumXpCost(ignoreRules)
 
         // Try first just in case another plugin, or the test need this
-        inventory.maximumRepairCost = maximumRepairCost
+        view.maximumRepairCost = maximumRepairCost
-        inventory.repairCost = anvilCost
+        view.repairCost = anvilCost
         // TODO for 2.x.x use anvil view & set directly there
 
         /* Because Minecraft likes to have the final say in the repair cost displayed
@@ -76,16 +75,15 @@ object AnvilXpUtil {
             CustomAnvil.instance, player
         ) {
             // retry after a tick
-            inventory.maximumRepairCost = maximumRepairCost
+            view.maximumRepairCost = maximumRepairCost
-            inventory.repairCost = anvilCost
+            view.repairCost = anvilCost
-            // TODO for 2.x.x use anvil view & set directly there
 
             if (player !is Player) return@scheduleOnEntity
 
             if (player.gameMode != GameMode.CREATIVE) {
                 val bypassToExpensive = (ConfigOptions.doReplaceTooExpensive) &&
                         (anvilCost >= 40) &&
-                        anvilCost < inventory.maximumRepairCost
+                        anvilCost < view.maximumRepairCost
 
                 DependencyManager.packetManager.setInstantBuild(player, bypassToExpensive)
             }
@@ -98,8 +96,7 @@ object AnvilXpUtil {
      * Display monetary cost needed for the work on the anvil inventory
      */
     private fun setAnvilPrice(
-        inventory: AnvilInventory,
+        view: AnvilView,
-        view: InventoryView,
         player: Player,
         cost: AnvilCost,
     ) {
@@ -117,22 +114,20 @@ object AnvilXpUtil {
             CustomAnvil.instance
         )
 
-        clearAnvilXpCost(inventory, view, player)
+        clearAnvilXpCost(view, player)
     }
 
     private fun clearAnvilXpCost(
-        inventory: AnvilInventory,
+        view: AnvilView,
-        view: InventoryView,
         player: HumanEntity,
     ) {
-        // TODO for 2.x.x use anvil view & set directly there
+        view.repairCost = 0
-        inventory.repairCost = 0
 
         // retry after a tick
         DependencyManager.scheduler.scheduleOnEntity(
             CustomAnvil.instance, player
         ) {
-            inventory.repairCost = 0
+            view.repairCost = 0
 
             if (player !is Player) return@scheduleOnEntity
             player.updateInventory()