diff --git a/src/main/kotlin/net/hareworks/kommand-lib/dsl/RegistryBuilders.kt b/src/main/kotlin/net/hareworks/kommand-lib/dsl/RegistryBuilders.kt index a373b43..88e343a 100644 --- a/src/main/kotlin/net/hareworks/kommand-lib/dsl/RegistryBuilders.kt +++ b/src/main/kotlin/net/hareworks/kommand-lib/dsl/RegistryBuilders.kt @@ -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 diff --git a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionConfig.kt b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionConfig.kt index 38958ff..28b4cf8 100644 --- a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionConfig.kt +++ b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionConfig.kt @@ -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) { diff --git a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionOptions.kt b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionOptions.kt index 515d5bf..21b5c3c 100644 --- a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionOptions.kt +++ b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionOptions.kt @@ -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? = customPath?.toList() + internal fun renameOverride(): List? = customPath?.toList() internal fun resolve(id: String) { resolvedId = id diff --git a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionPlanner.kt b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionPlanner.kt index 54c862d..f3b3b23 100644 --- a/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionPlanner.kt +++ b/src/main/kotlin/net/hareworks/kommand-lib/permissions/PermissionPlanner.kt @@ -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, commandName: String ) { - val rawOverride = node.permissionOptions.pathOverride() + val rawOverride = node.permissionOptions.renameOverride() val shouldSkip = node.permissionOptions.skip || (node.permissionOptions.preferSkipByDefault &&