[VaultUnlocking] Improve implement

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/exploitfix/VaultUnlocking.kt

@@ -9,7 +9,6 @@ import io.github.rothes.esu.bukkit.util.extension.ListenerExt.register
 import io.github.rothes.esu.bukkit.util.extension.ListenerExt.unregister
 import io.github.rothes.esu.bukkit.util.scheduler.ScheduledTask
 import io.github.rothes.esu.bukkit.util.scheduler.Scheduler
-import io.github.rothes.esu.bukkit.util.version.adapter.VaultDataAdapter.Companion.state
 import io.github.rothes.esu.core.util.CollectionUtils.removeWhile
 import io.github.rothes.esu.core.util.ComponentUtils.duration
 import io.github.rothes.esu.core.util.version.Version
@@ -20,7 +19,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import org.bukkit.Material
 import org.bukkit.World
 import org.bukkit.block.Block
-import org.bukkit.block.data.type.Vault
+import org.bukkit.block.Vault
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.block.Action
@@ -95,31 +94,23 @@ internal object VaultUnlocking: Listener {
 
         val block = event.clickedBlock ?: return
         if (block.type != Material.VAULT) return
-        val blockData = block.blockData as Vault
-        if (blockData.state != Vault.State.ACTIVE) return
+        val state = block.state as Vault
 
-        val itemStack = event.item ?: return
-        val type = itemStack.type
-        if (type == Material.TRIAL_KEY || type == Material.OMINOUS_TRIAL_KEY) {
-            val ominous = type == Material.OMINOUS_TRIAL_KEY
-            if (ominous != blockData.isOminous) return
+        if (!state.keyItem.isSimilar(event.item) || !state.hasConnectedPlayer(event.player.uniqueId))
+            return
 
-            val state = block.state as org.bukkit.block.Vault
-            if (state.hasRewardedPlayer(event.player.uniqueId)) return
-
-            val now = System.currentTimeMillis()
-            val config = ExploitFixesModule.config.vaultUnlocking
-            val expired = now - config.unlockExpiry.toMillis()
-            val times = getBlockTimes(block)
-            times.removeWhile { it < expired }
-            if (times.size < config.maxUnlocksPerVault) {
-                times.add(now)
-            } else {
-                event.isCancelled = true
-                val duration = if (times.isNotEmpty()) (times.getLong(0) - expired).milliseconds else Duration.INFINITE
-                val user = event.player.user
-                user.message(ExploitFixesModule.lang, { vaultUnlocking.tooManyUnlocks }, duration(duration, user))
-            }
+        val now = System.currentTimeMillis()
+        val config = ExploitFixesModule.config.vaultUnlocking
+        val expired = now - config.unlockExpiry.toMillis()
+        val times = getBlockTimes(block)
+        times.removeWhile { it < expired }
+        if (times.size < config.maxUnlocksPerVault) {
+            times.add(now)
+        } else {
+            event.isCancelled = true
+            val duration = if (times.isNotEmpty()) (times.getLong(0) - expired).milliseconds else Duration.INFINITE
+            val user = event.player.user
+            user.message(ExploitFixesModule.lang, { vaultUnlocking.tooManyUnlocks }, duration(duration, user))
         }
     }