AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

brigadier: rename onlyDirectExecution to allowArguments

Browse Source
This commit is contained in:
Moritz Zwerger 2023-07-30 01:50:37 +02:00
parent 3c0620874a
commit 8fe28982d2
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/commands/nodes/ArgumentNode.kt
View File

@ -38,7 +38,7 @@ class ArgumentNode : ExecutableNode, SignedNode {
} }
constructor(name: String, parser: ArgumentParser<*>, onlyDirectExecution: Boolean = true, executor: CommandExecutor) : super(name, executable = true, onlyDirectExecution = onlyDirectExecution, executor = executor) { constructor(name: String, parser: ArgumentParser<*>, allowArguments: Boolean = false, executor: CommandExecutor) : super(name, executable = true, allowArguments = allowArguments, executor = executor) {
this.executor = executor this.executor = executor
this.parser = parser this.parser = parser
} }

4
src/main/java/de/bixilon/minosoft/commands/nodes/ExecutableNode.kt
View File

@ -26,7 +26,7 @@ abstract class ExecutableNode(
name: String, name: String,
aliases: Set<String> = setOf(), aliases: Set<String> = setOf(),
val suggestion: SuggestionType? = null, val suggestion: SuggestionType? = null,
var onlyDirectExecution: Boolean = true, var allowArguments: Boolean = true,
var executor: CommandExecutor? = null, var executor: CommandExecutor? = null,
executable: Boolean = executor != null, executable: Boolean = executor != null,
redirect: CommandNode? = null, redirect: CommandNode? = null,
@ -68,7 +68,7 @@ abstract class ExecutableNode(
override fun executeChild(child: CommandNode, reader: CommandReader, stack: CommandStack) { override fun executeChild(child: CommandNode, reader: CommandReader, stack: CommandStack) {
super.executeChild(child, reader, stack) super.executeChild(child, reader, stack)
if (!onlyDirectExecution) { if (allowArguments) {
execute(stack) execute(stack)
} }
} }

2
src/main/java/de/bixilon/minosoft/commands/nodes/LiteralNode.kt
View File

@ -36,7 +36,7 @@ class LiteralNode : ExecutableNode {
) : super(name, aliases, suggestion, false, null, executable, redirect) ) : super(name, aliases, suggestion, false, null, executable, redirect)
constructor(name: String, aliases: Set<String> = setOf(), onlyDirectExecution: Boolean = true, executor: CommandExecutor) : super(name, aliases, onlyDirectExecution = onlyDirectExecution, executor = executor, executable = true) constructor(name: String, aliases: Set<String> = setOf(), allowArguments: Boolean = true, executor: CommandExecutor) : super(name, aliases, allowArguments = allowArguments, executor = executor, executable = true)
constructor(builder: CommandNodeBuilder) : this(builder.name ?: throw NullPointerException("No name in builder!"), setOf(), builder.suggestionType, builder.executable) constructor(builder: CommandNodeBuilder) : this(builder.name ?: throw NullPointerException("No name in builder!"), setOf(), builder.suggestionType, builder.executable)

2
src/main/java/de/bixilon/minosoft/terminal/commands/AccountManageCommand.kt
View File

@ -31,7 +31,7 @@ import de.bixilon.minosoft.util.account.microsoft.MicrosoftOAuthUtils
object AccountManageCommand : Command { object AccountManageCommand : Command {
override var node = LiteralNode("account") override var node = LiteralNode("account")
.addChild( .addChild(
LiteralNode("list", onlyDirectExecution = false, executor = { LiteralNode("list", allowArguments = true, executor = {
val filtered = it.collect() val filtered = it.collect()
if (filtered.isEmpty()) throw CommandException("No account matched your filter!") if (filtered.isEmpty()) throw CommandException("No account matched your filter!")

2
src/main/java/de/bixilon/minosoft/terminal/commands/ConnectCommand.kt
View File

@ -30,7 +30,7 @@ import de.bixilon.minosoft.util.DNSUtil
object ConnectCommand : Command { object ConnectCommand : Command {
override var node = LiteralNode("connect") override var node = LiteralNode("connect")
.addChild(ArgumentNode("address", StringParser(StringParser.StringModes.QUOTED), onlyDirectExecution = false) { stack -> .addChild(ArgumentNode("address", StringParser(StringParser.StringModes.QUOTED), allowArguments = true) { stack ->
val address = stack.get<String>("address")!! val address = stack.get<String>("address")!!
val version = stack.get<String>("version")?.let { Versions[it] ?: throw CommandException("Unknown version $it") } val version = stack.get<String>("version")?.let { Versions[it] ?: throw CommandException("Unknown version $it") }
val account = AccountProfileManager.selected.selected ?: throw CommandException("No account selected!") val account = AccountProfileManager.selected.selected ?: throw CommandException("No account selected!")

2
src/main/java/de/bixilon/minosoft/terminal/commands/ConnectionManageCommand.kt
View File

@ -27,7 +27,7 @@ import de.bixilon.minosoft.util.KUtil.table
object ConnectionManageCommand : Command { object ConnectionManageCommand : Command {
override var node = LiteralNode("connection") override var node = LiteralNode("connection")
.addChild( .addChild(
LiteralNode("list", onlyDirectExecution = false, executor = { LiteralNode("list", allowArguments = true, executor = {
val filtered = it.collect() val filtered = it.collect()
if (filtered.isEmpty()) throw CommandException("No connection matched your filter!") if (filtered.isEmpty()) throw CommandException("No connection matched your filter!")

2
src/main/java/de/bixilon/minosoft/terminal/commands/PingCommand.kt
View File

@ -22,7 +22,7 @@ import de.bixilon.minosoft.protocol.versions.Versions
object PingCommand : Command { object PingCommand : Command {
override var node = LiteralNode("ping") override var node = LiteralNode("ping")
.addChild(ArgumentNode("address", StringParser(StringParser.StringModes.QUOTED), onlyDirectExecution = false) { stack -> .addChild(ArgumentNode("address", StringParser(StringParser.StringModes.QUOTED), allowArguments = true) { stack ->
val address = stack.get<String>("address")!! val address = stack.get<String>("address")!!
val version = stack.get<String>("version")?.let { Versions[it] ?: throw IllegalArgumentException("Unknown version $it") } val version = stack.get<String>("version")?.let { Versions[it] ?: throw IllegalArgumentException("Unknown version $it") }
val connection = StatusConnection(address, version) val connection = StatusConnection(address, version)