Hare/kommand-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: path()->rename()のリファクタリング

Browse Source
This commit is contained in:
Keisuke Hirata 2025-12-04 07:51:06 +09:00
parent 640c8c78e3
commit 3df862a0c2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/net/hareworks/kommand-lib/dsl/RegistryBuilders.kt
View File

@ -180,7 +180,7 @@ abstract class BranchScope internal constructor(
} }
xNode.permissionOptions.skipPermission() xNode.permissionOptions.skipPermission()
yNode.permissionOptions.skipPermission() yNode.permissionOptions.skipPermission()
zNode.permissionOptions.path(name) zNode.permissionOptions.rename(name)
xNode.children += yNode xNode.children += yNode
yNode.children += zNode yNode.children += zNode
children += xNode children += xNode

2
src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionConfig.kt
View File

@ -27,7 +27,7 @@ class PermissionConfigBuilder internal constructor(private val plugin: JavaPlugi
var removeOnDisable: Boolean = true var removeOnDisable: Boolean = true
var includeRootNode: Boolean = true var includeRootNode: Boolean = true
var argumentPrefix: String = "arg" var argumentPrefix: String = "arg"
var defaultValue: PermissionDefault = PermissionDefault.OP var defaultValue: PermissionDefault = PermissionDefault.FALSE
var wildcard: Boolean = false var wildcard: Boolean = false
private var descriptionTemplate: (PermissionContext) -> String? = { ctx -> private var descriptionTemplate: (PermissionContext) -> String? = { ctx ->
when (ctx.kind) { when (ctx.kind) {

4
src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionOptions.kt
View File

@ -14,14 +14,14 @@ class PermissionOptions {
internal var resolvedId: String? = null internal var resolvedId: String? = null
private set private set
fun path(vararg segments: String) { fun rename(vararg segments: String) {
customPath = segments customPath = segments
.map { it.trim() } .map { it.trim() }
.filter { it.isNotEmpty() } .filter { it.isNotEmpty() }
.toMutableList() .toMutableList()
} }
internal fun pathOverride(): List<String>? = customPath?.toList() internal fun renameOverride(): List<String>? = customPath?.toList()
internal fun resolve(id: String) { internal fun resolve(id: String) {
resolvedId = id resolvedId = id

4
src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionPlanner.kt
View File

@ -29,7 +29,7 @@ internal class PermissionPlanner(
} }
definitions.forEach { definition -> definitions.forEach { definition ->
val overridePath = definition.permissionOptions.pathOverride() val overridePath = definition.permissionOptions.renameOverride()
val commandPath = if (overridePath != null) { val commandPath = if (overridePath != null) {
normalizeSegments(overridePath) normalizeSegments(overridePath)
} else { } else {
@ -61,7 +61,7 @@ internal class PermissionPlanner(
entries: MutableMap<String, PlannedPermission>, entries: MutableMap<String, PlannedPermission>,
commandName: String commandName: String
) { ) {
val rawOverride = node.permissionOptions.pathOverride() val rawOverride = node.permissionOptions.renameOverride()
val shouldSkip = val shouldSkip =
node.permissionOptions.skip || node.permissionOptions.skip ||
(node.permissionOptions.preferSkipByDefault && (node.permissionOptions.preferSkipByDefault &&