feat: path()->rename()のリファクタリング
This commit is contained in:
parent
640c8c78e3
commit
3df862a0c2
|
|
@ -180,7 +180,7 @@ abstract class BranchScope internal constructor(
|
|||
}
|
||||
xNode.permissionOptions.skipPermission()
|
||||
yNode.permissionOptions.skipPermission()
|
||||
zNode.permissionOptions.path(name)
|
||||
zNode.permissionOptions.rename(name)
|
||||
xNode.children += yNode
|
||||
yNode.children += zNode
|
||||
children += xNode
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class PermissionConfigBuilder internal constructor(private val plugin: JavaPlugi
|
|||
var removeOnDisable: Boolean = true
|
||||
var includeRootNode: Boolean = true
|
||||
var argumentPrefix: String = "arg"
|
||||
var defaultValue: PermissionDefault = PermissionDefault.OP
|
||||
var defaultValue: PermissionDefault = PermissionDefault.FALSE
|
||||
var wildcard: Boolean = false
|
||||
private var descriptionTemplate: (PermissionContext) -> String? = { ctx ->
|
||||
when (ctx.kind) {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ class PermissionOptions {
|
|||
internal var resolvedId: String? = null
|
||||
private set
|
||||
|
||||
fun path(vararg segments: String) {
|
||||
fun rename(vararg segments: String) {
|
||||
customPath = segments
|
||||
.map { it.trim() }
|
||||
.filter { it.isNotEmpty() }
|
||||
.toMutableList()
|
||||
}
|
||||
|
||||
internal fun pathOverride(): List<String>? = customPath?.toList()
|
||||
internal fun renameOverride(): List<String>? = customPath?.toList()
|
||||
|
||||
internal fun resolve(id: String) {
|
||||
resolvedId = id
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ internal class PermissionPlanner(
|
|||
}
|
||||
|
||||
definitions.forEach { definition ->
|
||||
val overridePath = definition.permissionOptions.pathOverride()
|
||||
val overridePath = definition.permissionOptions.renameOverride()
|
||||
val commandPath = if (overridePath != null) {
|
||||
normalizeSegments(overridePath)
|
||||
} else {
|
||||
|
|
@ -61,7 +61,7 @@ internal class PermissionPlanner(
|
|||
entries: MutableMap<String, PlannedPermission>,
|
||||
commandName: String
|
||||
) {
|
||||
val rawOverride = node.permissionOptions.pathOverride()
|
||||
val rawOverride = node.permissionOptions.renameOverride()
|
||||
val shouldSkip =
|
||||
node.permissionOptions.skip ||
|
||||
(node.permissionOptions.preferSkipByDefault &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user