feat: add script execution limits, permission/group checks, and script location visualization

Author: albardoo02

src/main/kotlin/com/github/albardoo02/scriptBlockNext/command/ScriptCommand.kt

@@ -246,6 +246,27 @@ class ScriptCommand: CommandExecutor, TabCompleter {
                 ScriptManager.addMode.remove(sender.uniqueId)
                 sender.sendMsg("mode_removal", "type" to type)
             }
+            "show" -> {
+                val world = sender.world
+                val scriptsInWorld = ScriptManager.scripts[type]?.filter { it.key.world == world.name }
+                if (scriptsInWorld.isNullOrEmpty()) {
+                    sender.sendMsg("error_no_script_info", "type" to type)
+                    return true
+                }
+                sender.sendMsg("info_show_start", "type" to type, "count" to scriptsInWorld.size.toString())
+                var ticks = 0
+                val taskId = Bukkit.getScheduler().runTaskTimer(ScriptBlockNext.instance, Runnable {
+                    if (ticks > 200) return@Runnable // 10 seconds
+                    for ((locData, _) in scriptsInWorld) {
+                        val loc = org.bukkit.Location(world, locData.x + 0.5, locData.y + 0.5, locData.z + 0.5)
+                        world.spawnParticle(org.bukkit.Particle.VILLAGER_HAPPY, loc, 3, 0.3, 0.3, 0.3, 0.0)
+                    }
+                    ticks += 10
+                }, 0L, 10L).taskId
+                Bukkit.getScheduler().runTaskLater(ScriptBlockNext.instance, Runnable {
+                    Bukkit.getScheduler().cancelTask(taskId)
+                }, 205L)
+            }
             else -> sender.sendMsg("error_unknown_action", "action" to action)
         }
         return true
@@ -283,7 +304,7 @@ class ScriptCommand: CommandExecutor, TabCompleter {
 
         if (args.size == 2 && first in listOf("interact", "break", "walk", "hit")) {
             if (!sender.hasPermission("scriptblocknext.command.$first")) return emptyList()
-            return listOf("create", "add", "remove", "view", "info", "copy").filter { it.startsWith(args[1], ignoreCase = true) }
+            return listOf("create", "add", "remove", "view", "info", "copy", "show").filter { it.startsWith(args[1], ignoreCase = true) }
         }
 
         if (args.size >= 3 && first in listOf("interact", "break", "walk", "hit")) {
@@ -323,7 +344,8 @@ class ScriptCommand: CommandExecutor, TabCompleter {
                 "[@oldCooldown:", $$"[$item:", "[@command ", "[@msg ", "@message ", "[@player ",
                 "[@server ", "[@console ", "[@bypass ", "[@sound:", "[@title:", "[@actionBar:",
                 "[@velocity:", "[@checkpoint]", "[@return]", "[@noFall:", "[@potion:",
-                "[@if ", "[@hand:", "[@bypassPerm:"
+                "[@if ", "[@hand:", "[@bypassPerm:", "[@perm:", "[@amount:", "[@globalAmount:",
+                "[@cancelEvent:true]", "[@cancelEvent:false]"
             )
 
             if (VaultManager.isHooked) {

src/main/kotlin/com/github/albardoo02/scriptBlockNext/hook/LuckPermsManager.kt

@@ -37,4 +37,15 @@ object LuckPermsManager {
         } catch (e: Exception) {
         }
     }
+
+    fun hasGroup(player: Player, group: String): Boolean {
+        if (!isHooked) return false
+        try {
+            val api = LuckPermsProvider.get()
+            val user = api.userManager.getUser(player.uniqueId) ?: return false
+            return user.getNodes().stream().anyMatch { it is InheritanceNode && it.groupName.equals(group, ignoreCase = true) }
+        } catch (e: Exception) {
+            return false
+        }
+    }
 }

src/main/kotlin/com/github/albardoo02/scriptBlockNext/listener/InteractListener.kt

@@ -67,7 +67,14 @@ class InteractListener: Listener {
 
         if (player.isSneaking && (player.isOp || player.hasPermission("scriptblocknext.admin"))) return
 
-        event.isCancelled = true
+        val hasCancelFalse = scriptData.commands.any {
+            val cleanCmd = it.removePrefix("!")
+            cleanCmd.startsWith("@cancelEvent:false", ignoreCase = true)
+        }
+        if (!hasCancelFalse) {
+            event.isCancelled = true
+        }
+        
         ScriptExecutor.run(player, scriptData, location)
     }
 }

src/main/kotlin/com/github/albardoo02/scriptBlockNext/listener/ScriptExecutor.kt

@@ -26,6 +26,8 @@ object ScriptExecutor {
 
     private val playerCooldowns = mutableMapOf<UUID, MutableMap<Location, Long>>()
     private val globalCooldowns = mutableMapOf<Location, Long>()
+    private val playerAmounts = mutableMapOf<UUID, MutableMap<Location, Int>>()
+    private val globalAmounts = mutableMapOf<Location, Int>()
 
     fun run(player: Player, scriptData: ScriptData, location: Location, actionType: String = "") {
         if (ScriptBlockNext.instance.config.getBoolean("output_script_log", false)) {
@@ -132,6 +134,28 @@ object ScriptExecutor {
                 val channelId = cleanCmd.substringAfter(":")
                 val isInChannel = DiscordSRVManager.getVoiceChannelId(player.uniqueId) == channelId
                 if (if (isInverted) isInChannel else !isInChannel) return
+            } else if (cleanCmd.startsWith("@perm:", ignoreCase = true)) {
+                val perm = cleanCmd.substringAfter(":")
+                val hasPerm = player.hasPermission(perm)
+                if (if (isInverted) hasPerm else !hasPerm) return
+            } else if (cleanCmd.startsWith("@group:", ignoreCase = true)) {
+                val group = cleanCmd.substringAfter(":")
+                val hasGroup = LuckPermsManager.hasGroup(player, group)
+                if (if (isInverted) hasGroup else !hasGroup) return
+            } else if (cleanCmd.startsWith("@amount:", ignoreCase = true)) {
+                val amountLimit = cleanCmd.substringAfter(":").toIntOrNull() ?: 0
+                val used = playerAmounts[player.uniqueId]?.get(location) ?: 0
+                if (used >= amountLimit) {
+                    player.sendMsg("error_amount_limit", "limit" to amountLimit.toString())
+                    return
+                }
+            } else if (cleanCmd.startsWith("@globalAmount:", ignoreCase = true)) {
+                val amountLimit = cleanCmd.substringAfter(":").toIntOrNull() ?: 0
+                val used = globalAmounts[location] ?: 0
+                if (used >= amountLimit) {
+                    player.sendMsg("error_global_amount_limit", "limit" to amountLimit.toString())
+                    return
+                }
             } else if (cleanCmd.startsWith("@if ")) {
                 val ifArgs = cleanCmd.substringAfter("@if ").split(" ", limit = 4)
                 if (ifArgs.size >= 3) {
@@ -185,6 +209,18 @@ object ScriptExecutor {
             MythicMobsManager.takeMythicItem(player, mythicId, amount)
         }
 
+        // Increment amounts
+        for (line in scriptData.commands) {
+            val cmd = PlaceholderManager.replace(player, line)
+            val cleanCmd = cmd.removePrefix("!")
+            if (cleanCmd.startsWith("@amount:", ignoreCase = true)) {
+                val map = playerAmounts.getOrPut(player.uniqueId) { mutableMapOf() }
+                map[location] = (map[location] ?: 0) + 1
+            } else if (cleanCmd.startsWith("@globalAmount:", ignoreCase = true)) {
+                globalAmounts[location] = (globalAmounts[location] ?: 0) + 1
+            }
+        }
+
         executeCommands(player, scriptData.commands, 0)
     }
 
@@ -202,6 +238,11 @@ object ScriptExecutor {
                 activeCmd.startsWith("@oldCooldown:") || activeCmd.startsWith("@action:") ||
                 activeCmd.startsWith("@blockType:") ||
                 activeCmd.startsWith("@hand:") ||
+                activeCmd.startsWith("@perm:", ignoreCase = true) ||
+                activeCmd.startsWith("@group:", ignoreCase = true) ||
+                activeCmd.startsWith("@amount:", ignoreCase = true) ||
+                activeCmd.startsWith("@globalAmount:", ignoreCase = true) ||
+                activeCmd.startsWith("@cancelEvent:", ignoreCase = true) ||
                 activeCmd.startsWith("@mmid:", ignoreCase = true) ||
                 activeCmd.startsWith("@dRole:", ignoreCase = true) || activeCmd.startsWith("@dChannel:", ignoreCase = true)) continue
             if (activeCmd.startsWith("@delay:")) {

src/main/resources/messages/lang_en.yml

@@ -9,6 +9,8 @@ error_cooldown: "&cYou are on cooldown (Remaining: {time}s)"
 error_look_at_block: "&cPlease look at a block."
 error_no_script_info: "&cNo {type} script is set on this block."
 error_selection_incomplete: "&cError: Selection is incomplete. Set Pos1 and Pos2 with the tool."
+error_amount_limit: "&cYou have reached the execution limit ({limit} times) for this script."
+error_global_amount_limit: "&cThis script has reached the global execution limit ({limit} times)."
 
 # Command Usage
 cmd_usage_main: "&cUsage: /sbn <type> <action> [args] or /sbn reload"
@@ -38,6 +40,7 @@ info_creator: "&7Creator: &b{creator}"
 info_commands_header: "&7Commands:"
 info_command_line: "&8[&7{index}&8] &f{command}"
 info_footer: "&e=========================="
+info_show_start: "&aShowing locations of {type} scripts with particles for 10 seconds (Total: {count})."
 
 # Clipboard & Paste
 error_empty_clipboard: "&cError: Clipboard is empty. Copy a script first using /sbn <type> copy."

src/main/resources/messages/lang_ja.yml

@@ -9,6 +9,8 @@ error_cooldown: "&cクールダウン中です(残り:{time}秒)"
 error_look_at_block: "&c視点をブロックに合わせて下さい。"
 error_no_script_info: "&cこのブロックに{type}のスクリプトは設定されていません。"
 error_selection_incomplete: "&cエラー: 範囲が正しく選択されていません。ツールでPos1とPos2を設定してください。"
+error_amount_limit: "&cこのスクリプトは実行上限({limit}回)に達しています。"
+error_global_amount_limit: "&cこのスクリプトはサーバー全体での実行上限({limit}回)に達しています。"
 
 # コマンドの使い方
 cmd_usage_main: "&c使用方法: /sbn <type> <action> [args] または /sbn reload"
@@ -38,6 +40,7 @@ info_creator: "&7登録者: &b{creator}"
 info_commands_header: "&7コマンド一覧:"
 info_command_line: "&8[&7{index}&8] &f{command}"
 info_footer: "&e=========================="
+info_show_start: "&a{type} のスクリプト位置を10秒間パーティクルで表示します (計{count}個)。"
 
 # クリップボード・ペースト
 error_empty_clipboard: "&cエラー: クリップボードが空です。先に /sbn <type> copy でスクリプトをコピーしてください。"