feat: tagsの削除

This commit is contained in:
2025-12-04 06:52:38 +09:00
parent 91dbd240b5
commit 8a860c85f4
7 changed files with 3 additions and 20 deletions
@@ -15,7 +15,6 @@ class PermissionConfig internal constructor(
val defaultDescription: (PermissionContext) -> String?,
val defaultValue: PermissionDefault,
val defaultWildcard: Boolean,
val defaultTags: Set<String>,
private val sessionProvider: (JavaPlugin) -> MutationSession
) {
fun session(plugin: JavaPlugin): MutationSession = sessionProvider(plugin)
@@ -29,8 +28,7 @@ class PermissionConfigBuilder internal constructor(private val plugin: JavaPlugi
var includeRootNode: Boolean = true
var argumentPrefix: String = "arg"
var defaultValue: PermissionDefault = PermissionDefault.OP
var wildcard: Boolean = true
private val tags: MutableSet<String> = linkedSetOf("kommand")
var wildcard: Boolean = false
private var descriptionTemplate: (PermissionContext) -> String? = { ctx ->
when (ctx.kind) {
PermissionNodeKind.COMMAND -> "Allows /${ctx.commandName}"
@@ -44,10 +42,6 @@ class PermissionConfigBuilder internal constructor(private val plugin: JavaPlugi
descriptionTemplate = block
}
fun tags(vararg values: String) {
values.filter { it.isNotBlank() }.forEach { tags += it.trim() }
}
fun session(factory: (JavaPlugin) -> MutationSession) {
sessionFactory = factory
}
@@ -67,7 +61,6 @@ class PermissionConfigBuilder internal constructor(private val plugin: JavaPlugi
defaultDescription = descriptionTemplate,
defaultValue = defaultValue,
defaultWildcard = wildcard,
defaultTags = tags.toSet(),
sessionProvider = sessionFactory ?: { PermitsLib.session(it) }
)
}
@@ -7,7 +7,6 @@ class PermissionOptions {
var description: String? = null
var defaultValue: PermissionDefault? = null
var wildcard: Boolean? = null
val tags: MutableSet<String> = linkedSetOf()
var skip: Boolean = false
private var customPath: MutableList<String>? = null
internal var preferSkipByDefault: Boolean = false
@@ -28,10 +27,6 @@ class PermissionOptions {
resolvedId = id
}
fun tags(vararg values: String) {
values.filter { it.isNotBlank() }.forEach { tags += it.trim() }
}
fun skipPermission() {
skip = true
}
@@ -18,6 +18,5 @@ data class PlannedPermission(
val description: String?,
val defaultValue: PermissionDefault,
val wildcard: Boolean,
val tags: Set<String>,
val registration: NodeRegistration
)
@@ -123,7 +123,6 @@ internal class PermissionPlanner(
val description = options.description ?: config.defaultDescription(context)
val defaultValue = options.defaultValue ?: config.defaultValue
val wildcard = options.wildcard ?: config.defaultWildcard
val tags = (config.defaultTags + options.tags).filter { it.isNotBlank() }.toSet()
options.resolve(finalId)
val parentPath = if (relativePath.isNotEmpty()) relativePath.dropLast(1).takeIf { it.isNotEmpty() } else null
return PlannedPermission(
@@ -133,7 +132,6 @@ internal class PermissionPlanner(
description = description,
defaultValue = defaultValue,
wildcard = wildcard,
tags = tags,
registration = registration
)
}
@@ -31,7 +31,6 @@ internal class PermissionRuntime(
entry.description?.let { description = it }
defaultValue = entry.defaultValue
wildcard = entry.wildcard
entry.tags.forEach(::tag)
}
val parent = entry.parentPath
if (parent != null && parent.isNotEmpty()) {