Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Refactor and reformat commands

Browse Source
This commit is contained in:
Dico200
2018-07-27 23:31:24 +01:00
parent 2a726e1b61
commit 2c1aee89f6
12 changed files with 94 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/io/dico/parcels2/command/ParcelAddCommands.kt → src/main/kotlin/io/dico/parcels2/command/CommandsAddedStatus.kt
View File

@@ -8,7 +8,7 @@ import io.dico.parcels2.util.hasAdminManage
import org.bukkit.OfflinePlayer
import org.bukkit.entity.Player
class ParcelAddCommands(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
class CommandsAddedStatus(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
@Cmd("allow", aliases = ["add", "permit"])
@Desc("Allows a player to build on this parcel",

7
src/main/kotlin/io/dico/parcels2/command/CommandsAdmin.kt Normal file
View File

@@ -0,0 +1,7 @@
package io.dico.parcels2.command
import io.dico.parcels2.ParcelsPlugin
class CommandsAdmin(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
}

2
src/main/kotlin/io/dico/parcels2/command/DebugCommands.kt → src/main/kotlin/io/dico/parcels2/command/CommandsDebug.kt
View File

@@ -6,7 +6,7 @@ import io.dico.parcels2.ParcelsPlugin
import org.bukkit.Bukkit
import org.bukkit.entity.Player
class DebugCommands(val plugin: ParcelsPlugin) {
class CommandsDebug(val plugin: ParcelsPlugin) {
@Cmd("reloadoptions")
fun reloadOptions() {

2
src/main/kotlin/io/dico/parcels2/command/ParcelCommands.kt → src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt
View File

@@ -13,7 +13,7 @@ import io.dico.parcels2.util.uuid
import org.bukkit.entity.Player
//@Suppress("unused")
class ParcelCommands(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
class CommandsGeneral(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
@Cmd("auto")
@Desc("Finds the unclaimed parcel nearest to origin,",

2
src/main/kotlin/io/dico/parcels2/command/ParcelOptionCommands.kt → src/main/kotlin/io/dico/parcels2/command/CommandsParcelOptions.kt
View File

@@ -10,7 +10,7 @@ import io.dico.parcels2.ParcelsPlugin
import org.bukkit.entity.Player
import kotlin.reflect.KMutableProperty
class ParcelOptionCommands(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
class CommandsParcelOptions(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
@Cmd("inputs")
@Desc("Sets whether players who are not allowed to",
"build here can use levers, buttons,",

85
src/main/kotlin/io/dico/parcels2/command/NamedParcelTargetType.kt
View File

@@ -1,85 +0,0 @@
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 io.dico.parcels2.util.isValid
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.isValid }
?: 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)
}
}

7
src/main/kotlin/io/dico/parcels2/command/ParcelAdminCommands.kt
View File

@@ -1,7 +0,0 @@
package io.dico.parcels2.command
import io.dico.parcels2.ParcelsPlugin
class ParcelAdminCommands(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
}

12
src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt
View File

@@ -14,16 +14,16 @@ fun getParcelCommands(plugin: ParcelsPlugin): ICommandDispatcher {
.addParameterType(true, ParcelHomeParameterType(plugin.worlds))
.group("parcel", "plot", "plots", "p")
.registerCommands(ParcelCommands(plugin))
.registerCommands(ParcelAddCommands(plugin))
.registerCommands(CommandsGeneral(plugin))
.registerCommands(CommandsAddedStatus(plugin))
.group("option")
.apply { ParcelOptionCommands.setGroupDescription(this) }
.registerCommands(ParcelOptionCommands(plugin))
.apply { CommandsParcelOptions.setGroupDescription(this) }
.registerCommands(CommandsParcelOptions(plugin))
.parent()
.group("admin", "a")
.registerCommands(ParcelAdminCommands(plugin))
.registerCommands(CommandsAdmin(plugin))
.parent()
.putDebugCommands(plugin)
@@ -37,7 +37,7 @@ private fun CommandBuilder.putDebugCommands(plugin: ParcelsPlugin): CommandBuild
if (!logger.isDebugEnabled) return this
//@formatter:off
return group("debug", "d")
.registerCommands(DebugCommands(plugin))
.registerCommands(CommandsDebug(plugin))
.parent()
//@formatter:on
}

0
src/main/kotlin/io/dico/parcels2/command/CommandRequirement.kt → src/main/kotlin/io/dico/parcels2/command/ParcelCommandReceivers.kt
View File

76
src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
View File

@@ -3,10 +3,14 @@ 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.ParameterConfig
import io.dico.dicore.command.parameter.type.ParameterType
import io.dico.parcels2.Parcel
import io.dico.parcels2.ParcelWorld
import io.dico.parcels2.Worlds
import io.dico.parcels2.util.isValid
import org.bukkit.Bukkit
import org.bukkit.OfflinePlayer
import org.bukkit.command.CommandSender
import org.bukkit.entity.Player
@@ -44,3 +48,75 @@ class ParcelParameterType(val worlds: Worlds) : ParameterType<Parcel, Void>(Parc
}
}
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.isValid }
?: 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
src/main/kotlin/io/dico/parcels2/command/ParcelsChatController.kt
View File

@@ -5,5 +5,4 @@ import io.dico.dicore.command.chat.AbstractChatController
class ParcelsChatController : AbstractChatController() {
}