Skip to content

Implement NestedArguments (#529)#613

Merged
JorelAli merged 16 commits intoCommandAPI:dev/devfrom
MC-XiaoHei:dev/dev
Nov 20, 2024
Merged

Implement NestedArguments (#529)#613
JorelAli merged 16 commits intoCommandAPI:dev/devfrom
MC-XiaoHei:dev/dev

Conversation

@MC-XiaoHei
Copy link
Contributor

@MC-XiaoHei MC-XiaoHei commented Nov 14, 2024 •
edited
Loading

Implemented the feature in #529 with Kotlin DSL support and changed the method name to 'thenNested' as suggested in Discord

Usage:

Java: 
new CommandTree("example")
    .thenNested(
        new LiteralArgument("arg1"),
        new StringArgument("arg2"),
        new StringArgument("arg3"),
        new DoubleArgument("arg4", 0),
        new StringArgument("arg5")
            .executes(...)
    )
Kotlin: 
CommandTree("example")
    .thenNested(
        LiteralArgument("arg1"),
        StringArgument("arg2"),
        StringArgument("arg3"),
        DoubleArgument("arg4", 0),
        StringArgument("arg5")
            .executes { ... }
    )
Kotlin DSL 
commandTree("example") {
    nested {
        literalArgument("arg1")
        stringArgument("arg2")
        stringArgument("arg3")
        doubleArgument("arg4", 0.0)
        stringArgument("arg5") {
            anyExecutor { ... }
        }
    }
}
// or
commandTree("example") {
    nestedArguments(
        LiteralArgument("arg1"),
        StringArgument("arg2"),
        StringArgument("arg3"),
        DoubleArgument("arg4", 0.0),
        StringArgument("arg5")
    ) {
        anyExecutor { ... }
    }
}

@MC-XiaoHei
Copy link
Contributor Author

MC-XiaoHei commented Nov 14, 2024

By the way, I'm not quite sure how to write javadoc for 'thenNested', can someone help me?

@MC-XiaoHei
Copy link
Contributor Author

MC-XiaoHei commented Nov 14, 2024

Oh I found that I modified one space and used unnecessary parentheses in two places, I'll fix it

@MC-XiaoHei
Copy link
Contributor Author

MC-XiaoHei commented Nov 15, 2024 •
edited
Loading

I've used some black magic for the implementation of the nested { } function, and I'm not sure if it meets the spec.
anyway it works

@MC-XiaoHei MC-XiaoHei marked this pull request as ready for review November 15, 2024 09:04
@MC-XiaoHei MC-XiaoHei requested a review from JorelAli November 15, 2024 09:04
willkroboth
willkroboth reviewed Nov 17, 2024
View reviewed changes
willkroboth
willkroboth reviewed Nov 18, 2024
View reviewed changes
DerEchtePilz
DerEchtePilz reviewed Nov 18, 2024
View reviewed changes
@MC-XiaoHei
Copy link
Contributor Author

MC-XiaoHei commented Nov 19, 2024

Thank you for your help! Hopefully there are no other issues xD

@DerEchtePilz
Copy link
Member

DerEchtePilz commented Nov 19, 2024

I'd really like to run some manual tests with this before merging but generally looks good.

DerEchtePilz
DerEchtePilz reviewed Nov 19, 2024
View reviewed changes
MC-XiaoHei and others added 2 commits November 20, 2024 07:32
@MC-XiaoHei @willkroboth
Update commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/…
54d3e36 
…commandapi-bukkit-kotlin-test/src/test/kotlin/dev/jorel/commandapi/test/dsltests/CommandTreeTests.kt

Co-authored-by: willkroboth <[email protected]>
@MC-XiaoHei
fix indentation
8771911
@MC-XiaoHei
Copy link
Contributor Author

MC-XiaoHei commented Nov 20, 2024

thanks for your help again!
I make so much mistakes xD

@JorelAli
Copy link
Member

JorelAli commented Nov 20, 2024

This looks good, thanks!

@JorelAli JorelAli merged commit 27b9360 into CommandAPI:dev/dev Nov 20, 2024
@JorelAli JorelAli mentioned this pull request Nov 20, 2024
Closed
@MC-XiaoHei MC-XiaoHei deleted the dev/dev branch November 21, 2024 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JorelAli JorelAli JorelAli approved these changes

@willkroboth willkroboth willkroboth approved these changes

@DerEchtePilz DerEchtePilz DerEchtePilz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MC-XiaoHei @DerEchtePilz @JorelAli @willkroboth