Update parcels2 project
This commit is contained in:
Dico200
@@ -23,7 +23,7 @@ class CommandAsyncScope {
|
||||
|
||||
suspend fun <T> HasPlugin.awaitSynchronousTask(delay: Int = 0, task: () -> T): T {
|
||||
return suspendCoroutine { cont: Continuation<T> ->
|
||||
plugin.server.scheduler.runTaskLater(plugin, l@ {
|
||||
plugin.server.scheduler.runTaskLater(plugin, l@{
|
||||
val result = try {
|
||||
task()
|
||||
} catch (ex: CommandException) {
|
||||
@@ -45,7 +45,7 @@ class CommandAsyncScope {
|
||||
}
|
||||
|
||||
fun <T : Any?> HasPlugin.delegateCommandAsync(context: ExecutionContext,
|
||||
block: suspend CommandAsyncScope.() -> T) {
|
||||
block: suspend CommandAsyncScope.() -> T) {
|
||||
|
||||
val job: Deferred<Any?> = async(/*context = plugin.storage.asyncDispatcher, */start = CoroutineStart.ATOMIC) {
|
||||
CommandAsyncScope().block()
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
package io.dico.parcels2.command
|
||||
|
||||
import io.dico.dicore.command.parameter.ArgumentBuffer
|
||||
import io.dico.dicore.command.parameter.Parameter
|
||||
import io.dico.dicore.command.parameter.type.ParameterConfig
|
||||
import io.dico.dicore.command.parameter.type.ParameterType
|
||||
import io.dico.parcels2.ParcelWorld
|
||||
import io.dico.parcels2.Worlds
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
class NamedParcelTarget(val world: ParcelWorld, val player: OfflinePlayer, val index: Int)
|
||||
|
||||
@Target(AnnotationTarget.VALUE_PARAMETER)
|
||||
@Retention(AnnotationRetention.RUNTIME)
|
||||
annotation class NamedParcelDefault(val value: NamedParcelDefaultValue)
|
||||
|
||||
enum class NamedParcelDefaultValue {
|
||||
FIRST_OWNED,
|
||||
NULL
|
||||
}
|
||||
|
||||
class NamedParcelTargetConfig : ParameterConfig<NamedParcelDefault,
|
||||
NamedParcelDefaultValue>(NamedParcelDefault::class.java) {
|
||||
|
||||
override fun toParameterInfo(annotation: NamedParcelDefault): NamedParcelDefaultValue {
|
||||
return annotation.value
|
||||
}
|
||||
}
|
||||
|
||||
class ParcelHomeParameterType(val worlds: Worlds) : ParameterType<NamedParcelTarget,
|
||||
NamedParcelDefaultValue>(NamedParcelTarget::class.java, NamedParcelTargetConfig()) {
|
||||
|
||||
val regex = Regex.fromLiteral("((.+)->)?(.+)|((.+):([0-9]+))")
|
||||
|
||||
private fun requirePlayer(sender: CommandSender, parameter: Parameter<*, *>): Player {
|
||||
if (sender !is Player) invalidInput(parameter, "console cannot omit the player name")
|
||||
return sender
|
||||
}
|
||||
|
||||
@Suppress("UsePropertyAccessSyntax")
|
||||
private fun getOfflinePlayer(input: String, parameter: Parameter<*, *>) = Bukkit.getOfflinePlayer(input)
|
||||
?.takeIf { it.isOnline() || it.hasPlayedBefore() }
|
||||
?: invalidInput(parameter, "do not know who $input is")
|
||||
|
||||
override fun parse(parameter: Parameter<NamedParcelTarget, NamedParcelDefaultValue>,
|
||||
sender: CommandSender, buffer: ArgumentBuffer): NamedParcelTarget {
|
||||
val matchResult = regex.matchEntire(buffer.next())
|
||||
?: invalidInput(parameter, "must be a player, index, or player:index (/${regex.pattern}/)")
|
||||
|
||||
val world = worlds.getTargetWorld(matchResult.groupValues[2], sender, parameter)
|
||||
|
||||
matchResult.groupValues[3].takeUnless { it.isEmpty() }?.let {
|
||||
// first group was matched, it's a player or an int
|
||||
it.toIntOrNull()?.let {
|
||||
requirePlayer(sender, parameter)
|
||||
return NamedParcelTarget(world, sender as Player, it)
|
||||
}
|
||||
|
||||
return NamedParcelTarget(world, getOfflinePlayer(it, parameter), 0)
|
||||
}
|
||||
|
||||
val player = getOfflinePlayer(matchResult.groupValues[5], parameter)
|
||||
val index = matchResult.groupValues[6].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
return NamedParcelTarget(world, player, index)
|
||||
}
|
||||
|
||||
override fun getDefaultValue(parameter: Parameter<NamedParcelTarget, NamedParcelDefaultValue>,
|
||||
sender: CommandSender, buffer: ArgumentBuffer): NamedParcelTarget? {
|
||||
if (parameter.paramInfo == NamedParcelDefaultValue.NULL) {
|
||||
return null
|
||||
}
|
||||
|
||||
val world = worlds.getTargetWorld(null, sender, parameter)
|
||||
val player = requirePlayer(sender, parameter)
|
||||
return NamedParcelTarget(world, player, 0)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,23 +1,16 @@
|
||||
package io.dico.parcels2.command
|
||||
|
||||
import io.dico.dicore.command.CommandBuilder
|
||||
import io.dico.dicore.command.CommandException
|
||||
import io.dico.dicore.command.ICommandDispatcher
|
||||
import io.dico.dicore.command.parameter.ArgumentBuffer
|
||||
import io.dico.dicore.command.parameter.IParameter
|
||||
import io.dico.dicore.command.parameter.type.ParameterType
|
||||
import io.dico.parcels2.*
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.OfflinePlayer
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
import io.dico.parcels2.ParcelsPlugin
|
||||
import io.dico.parcels2.debugging
|
||||
|
||||
@Suppress("UsePropertyAccessSyntax")
|
||||
fun getParcelCommands(plugin: ParcelsPlugin): ICommandDispatcher {
|
||||
//@formatter:off
|
||||
return CommandBuilder()
|
||||
.addParameterType(false, ParcelParameterType(plugin.worlds))
|
||||
.addParameterType(false, ParcelHomeParameterType(plugin.worlds))
|
||||
.addParameterType(true, ParcelHomeParameterType(plugin.worlds))
|
||||
.group("parcel", "plot", "plots", "p")
|
||||
.registerCommands(ParcelCommands(plugin))
|
||||
.putDebugCommands(plugin)
|
||||
@@ -34,84 +27,3 @@ private fun CommandBuilder.putDebugCommands(plugin: ParcelsPlugin): CommandBuild
|
||||
.parent()
|
||||
//@formatter:on
|
||||
}
|
||||
|
||||
private fun invalidInput(parameter: IParameter<*>, message: String): Nothing {
|
||||
throw CommandException("invalid input for ${parameter.name}: $message")
|
||||
}
|
||||
|
||||
private fun Worlds.getTargetWorld(input: String?, sender: CommandSender, parameter: IParameter<*>): ParcelWorld {
|
||||
val worldName = input
|
||||
?.takeUnless { it.isEmpty() }
|
||||
?: (sender as? Player)?.world?.name
|
||||
?: invalidInput(parameter, "console cannot omit the world name")
|
||||
|
||||
return getWorld(worldName)
|
||||
?: invalidInput(parameter, "$worldName is not a parcel world")
|
||||
}
|
||||
|
||||
private class ParcelParameterType(val worlds: Worlds) : ParameterType<Parcel, Unit>(Parcel::class.java) {
|
||||
val regex = Regex.fromLiteral("((.+)->)?([0-9]+):([0-9]+)")
|
||||
|
||||
override fun parse(parameter: IParameter<Parcel>, sender: CommandSender, buffer: ArgumentBuffer): Parcel {
|
||||
val matchResult = regex.matchEntire(buffer.next())
|
||||
?: invalidInput(parameter, "must match (w->)?a:b (/${regex.pattern}/)")
|
||||
|
||||
val world = worlds.getTargetWorld(matchResult.groupValues[2], sender, parameter)
|
||||
|
||||
val x = matchResult.groupValues[3].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
val z = matchResult.groupValues[4].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
return world.parcelByID(x, z)
|
||||
?: invalidInput(parameter, "parcel id is out of range")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class NamedParcelTarget(val world: ParcelWorld, val player: OfflinePlayer, val index: Int)
|
||||
|
||||
private class ParcelHomeParameterType(val worlds: Worlds) : ParameterType<NamedParcelTarget, Unit>(NamedParcelTarget::class.java) {
|
||||
val regex = Regex.fromLiteral("((.+)->)?(.+)|((.+):([0-9]+))")
|
||||
|
||||
private fun requirePlayer(sender: CommandSender, parameter: IParameter<*>): Player {
|
||||
if (sender !is Player) invalidInput(parameter, "console cannot omit the player name")
|
||||
return sender
|
||||
}
|
||||
|
||||
@Suppress("UsePropertyAccessSyntax")
|
||||
private fun getOfflinePlayer(input: String, parameter: IParameter<*>) = Bukkit.getOfflinePlayer(input)
|
||||
?.takeIf { it.isOnline() || it.hasPlayedBefore() }
|
||||
?: invalidInput(parameter, "do not know who $input is")
|
||||
|
||||
override fun parse(parameter: IParameter<NamedParcelTarget>, sender: CommandSender, buffer: ArgumentBuffer): NamedParcelTarget {
|
||||
val matchResult = regex.matchEntire(buffer.next())
|
||||
?: invalidInput(parameter, "must be a player, index, or player:index (/${regex.pattern}/)")
|
||||
|
||||
val world = worlds.getTargetWorld(matchResult.groupValues[2], sender, parameter)
|
||||
|
||||
matchResult.groupValues[3].takeUnless { it.isEmpty() }?.let {
|
||||
// first group was matched, it's a player or an int
|
||||
it.toIntOrNull()?.let {
|
||||
requirePlayer(sender, parameter)
|
||||
return NamedParcelTarget(world, sender as Player, it)
|
||||
}
|
||||
|
||||
return NamedParcelTarget(world, getOfflinePlayer(it, parameter), 0)
|
||||
}
|
||||
|
||||
val player = getOfflinePlayer(matchResult.groupValues[5], parameter)
|
||||
val index = matchResult.groupValues[6].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
return NamedParcelTarget(world, player, index)
|
||||
}
|
||||
|
||||
override fun getDefaultValue(parameter: IParameter<NamedParcelTarget>, sender: CommandSender, buffer: ArgumentBuffer): NamedParcelTarget {
|
||||
val world = worlds.getTargetWorld(null, sender, parameter)
|
||||
val player = requirePlayer(sender, parameter)
|
||||
return NamedParcelTarget(world, player, 0)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -75,8 +75,19 @@ class ParcelCommands(override val plugin: ParcelsPlugin) : HasWorlds, HasPlugin
|
||||
?: error("The specified parcel could not be matched")
|
||||
|
||||
player.teleport(targetMatch.homeLocation)
|
||||
""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Cmd("claim")
|
||||
@Desc("If this parcel is unowned, makes you the owner",
|
||||
shortVersion = "claims this parcel")
|
||||
fun cmdClaim(player: Player) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package io.dico.parcels2.command
|
||||
|
||||
import io.dico.dicore.command.CommandException
|
||||
import io.dico.dicore.command.parameter.ArgumentBuffer
|
||||
import io.dico.dicore.command.parameter.Parameter
|
||||
import io.dico.dicore.command.parameter.type.ParameterType
|
||||
import io.dico.parcels2.Parcel
|
||||
import io.dico.parcels2.ParcelWorld
|
||||
import io.dico.parcels2.Worlds
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
fun invalidInput(parameter: Parameter<*, *>, message: String): Nothing {
|
||||
throw CommandException("invalid input for ${parameter.name}: $message")
|
||||
}
|
||||
|
||||
fun Worlds.getTargetWorld(input: String?, sender: CommandSender, parameter: Parameter<*, *>): ParcelWorld {
|
||||
val worldName = input
|
||||
?.takeUnless { it.isEmpty() }
|
||||
?: (sender as? Player)?.world?.name
|
||||
?: invalidInput(parameter, "console cannot omit the world name")
|
||||
|
||||
return getWorld(worldName)
|
||||
?: invalidInput(parameter, "$worldName is not a parcel world")
|
||||
}
|
||||
|
||||
class ParcelParameterType(val worlds: Worlds) : ParameterType<Parcel, Void>(Parcel::class.java) {
|
||||
val regex = Regex.fromLiteral("((.+)->)?([0-9]+):([0-9]+)")
|
||||
|
||||
override fun parse(parameter: Parameter<Parcel, Void>, sender: CommandSender, buffer: ArgumentBuffer): Parcel {
|
||||
val matchResult = regex.matchEntire(buffer.next())
|
||||
?: invalidInput(parameter, "must match (w->)?a:b (/${regex.pattern}/)")
|
||||
|
||||
val world = worlds.getTargetWorld(matchResult.groupValues[2], sender, parameter)
|
||||
|
||||
val x = matchResult.groupValues[3].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
val z = matchResult.groupValues[4].toIntOrNull()
|
||||
?: invalidInput(parameter, "couldn't parse int")
|
||||
|
||||
return world.parcelByID(x, z)
|
||||
?: invalidInput(parameter, "parcel id is out of range")
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user