-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
114 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 61 additions & 14 deletions
75
.../main/kotlin/com/projectcitybuild/pcbridge/paper/features/builds/commands/BuildCommand.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,80 @@ | ||
| package com.projectcitybuild.pcbridge.paper.features.builds.commands | ||
|
|
||
| import com.github.shynixn.mccoroutine.bukkit.launch | ||
| import com.mojang.brigadier.arguments.StringArgumentType | ||
| import com.mojang.brigadier.context.CommandContext | ||
| import com.mojang.brigadier.suggestion.SuggestionsBuilder | ||
| import com.mojang.brigadier.tree.LiteralCommandNode | ||
| import com.projectcitybuild.pcbridge.paper.features.builds.commands.repositories.BuildRepository | ||
| import com.projectcitybuild.pcbridge.paper.support.brigadier.executesSuspending | ||
| import com.projectcitybuild.pcbridge.paper.support.brigadier.suggestsSuspending | ||
| import io.papermc.paper.command.brigadier.CommandSourceStack | ||
| import io.papermc.paper.command.brigadier.Commands | ||
| import net.kyori.adventure.text.minimessage.MiniMessage | ||
| import org.bukkit.Location | ||
| import org.bukkit.Server | ||
| import org.bukkit.event.player.PlayerTeleportEvent | ||
| import org.bukkit.plugin.Plugin | ||
|
|
||
| @Suppress("UnstableApiUsage") | ||
| class BuildCommand( | ||
| private val plugin: Plugin, | ||
| private val buildRepository: BuildRepository, | ||
| private val server: Server, | ||
| ) { | ||
| fun buildLiteral(plugin: Plugin): LiteralCommandNode<CommandSourceStack> { | ||
| fun buildLiteral(): LiteralCommandNode<CommandSourceStack> { | ||
| return Commands.literal("build") | ||
| .then( | ||
| Commands.argument("name", StringArgumentType.string()) | ||
| .suggests { _, suggestions -> | ||
| plugin.launch { | ||
| buildRepository.names().forEach(suggestions::suggest) | ||
| } | ||
| suggestions.buildFuture() | ||
| } | ||
| .executes { context -> | ||
| val name = context.getArgument("name", String::class.java) | ||
| context.source.sender.sendMessage(name) | ||
| com.mojang.brigadier.Command.SINGLE_SUCCESS | ||
| } | ||
| Commands.argument("name", StringArgumentType.greedyString()) | ||
| .suggestsSuspending(plugin, this::suggestBuild) | ||
| .executesSuspending(plugin, this::execute) | ||
| ) | ||
| .build() | ||
| } | ||
|
|
||
| private suspend fun suggestBuild( | ||
| context: CommandContext<CommandSourceStack>, | ||
| suggestions: SuggestionsBuilder, | ||
| ) { | ||
| val name = suggestions.remaining.lowercase() | ||
|
|
||
| // TODO: optimize with a Trie later | ||
| buildRepository.names() | ||
| .filter { it.lowercase().startsWith(name) } | ||
| .forEach(suggestions::suggest) | ||
| } | ||
|
|
||
| private suspend fun execute(context: CommandContext<CommandSourceStack>) { | ||
| val name = context.getArgument("name", String::class.java) | ||
|
|
||
| val build = buildRepository.get(name = name) | ||
| if (build == null) { | ||
| context.source.sender.sendMessage( | ||
| MiniMessage.miniMessage().deserialize("Build not found") | ||
| ) | ||
| return | ||
| } | ||
| val world = server.getWorld(build.world) | ||
| if (world == null) { | ||
| context.source.sender.sendMessage( | ||
| MiniMessage.miniMessage().deserialize("<red>Error: Could not find world ${build.world}</red>") | ||
| ) | ||
| return | ||
| } | ||
|
|
||
| context.source.sender.sendMessage( | ||
| MiniMessage.miniMessage().deserialize("<gray>Teleporting to $name...</gray>") | ||
| ) | ||
| val location = Location( | ||
| world, | ||
| build.x, | ||
| build.y, | ||
| build.z, | ||
| build.yaw, | ||
| build.pitch, | ||
| ) | ||
| context.source.executor?.teleportAsync( | ||
| location, | ||
| PlayerTeleportEvent.TeleportCause.COMMAND, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
...om/projectcitybuild/pcbridge/paper/support/brigadier/RequiredArgumentBuilderExtensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.projectcitybuild.pcbridge.paper.support.brigadier | ||
|
|
||
| import com.github.shynixn.mccoroutine.bukkit.launch | ||
| import com.mojang.brigadier.Command | ||
| import com.mojang.brigadier.builder.RequiredArgumentBuilder | ||
| import com.mojang.brigadier.context.CommandContext | ||
| import com.mojang.brigadier.suggestion.SuggestionsBuilder | ||
| import org.bukkit.plugin.Plugin | ||
|
|
||
| /** | ||
| * Same as [RequiredArgumentBuilder.suggests] but bridged to a suspending function | ||
| */ | ||
| fun <S, T> RequiredArgumentBuilder<S, T>.suggestsSuspending( | ||
| plugin: Plugin, | ||
| block: suspend (CommandContext<S>, SuggestionsBuilder) -> Unit, | ||
| ): RequiredArgumentBuilder<S, T> { | ||
| return suggests { context, suggestions -> | ||
| plugin.launch { block(context, suggestions) } | ||
| suggestions.buildFuture() | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Same as [RequiredArgumentBuilder.executes] but bridged to a suspending function | ||
| */ | ||
| fun <S, T> RequiredArgumentBuilder<S, T>.executesSuspending( | ||
| plugin: Plugin, | ||
| block: suspend (CommandContext<S>) -> Unit, | ||
| ): RequiredArgumentBuilder<S, T> { | ||
| return executes { context -> | ||
| plugin.launch { block(context) } | ||
| Command.SINGLE_SUCCESS | ||
| } | ||
| } |