1 files changed, 90 insertions, 83 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
index 730625e..1b20f72 100644
--- a/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
@@ -1,83 +1,90 @@
-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.*
-import io.dico.parcels2.command.ProfileKind.Companion.ANY
-import io.dico.parcels2.command.ProfileKind.Companion.FAKE
-import io.dico.parcels2.command.ProfileKind.Companion.REAL
-import org.bukkit.Location
-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 ParcelProvider.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 parcelProvider: ParcelProvider) : 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 = parcelProvider.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.getParcelById(x, z)
-            ?: invalidInput(parameter, "parcel id is out of range")
-    }
-
-}
-
-annotation class ProfileKind(val kind: Int) {
-    companion object : ParameterConfig<ProfileKind, Int>(ProfileKind::class.java) {
-        const val REAL = 1
-        const val FAKE = 2
-        const val ANY = REAL or FAKE
-
-        override fun toParameterInfo(annotation: ProfileKind): Int {
-            return annotation.kind
-        }
-    }
-}
-
-class ProfileParameterType : ParameterType<PlayerProfile, Int>(PlayerProfile::class.java, ProfileKind) {
-
-    override fun parse(parameter: Parameter<PlayerProfile, Int>, sender: CommandSender, buffer: ArgumentBuffer): PlayerProfile {
-        val info = parameter.paramInfo ?: REAL
-        val allowReal = (info and REAL) != 0
-        val allowFake = (info and FAKE) != 0
-
-        val input = buffer.next()!!
-        return PlayerProfile.byName(input, allowReal, allowFake)
-    }
-
-    override fun complete(
-        parameter: Parameter<PlayerProfile, Int>,
-        sender: CommandSender,
-        location: Location?,
-        buffer: ArgumentBuffer
-    ): MutableList<String> {
-        logger.info("Completing PlayerProfile: ${buffer.next()}")
-        return super.complete(parameter, sender, location, buffer)
-    }
-}
+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.*
+import io.dico.parcels2.command.ProfileKind.Companion.FAKE
+import io.dico.parcels2.command.ProfileKind.Companion.REAL
+import org.bukkit.Location
+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 ParcelProvider.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 parcelProvider: ParcelProvider) : 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 = parcelProvider.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.getParcelById(x, z)
+            ?: invalidInput(parameter, "parcel id is out of range")
+    }
+
+}
+
+annotation class ProfileKind(val kind: Int) {
+    companion object : ParameterConfig<ProfileKind, Int>(ProfileKind::class.java) {
+        const val REAL = 1
+        const val FAKE = 2
+        const val ANY = REAL or FAKE
+        const val ALLOW_INVALID = 4
+
+        override fun toParameterInfo(annotation: ProfileKind): Int {
+            return annotation.kind
+        }
+    }
+}
+
+class ProfileParameterType : ParameterType<PlayerProfile, Int>(PlayerProfile::class.java, ProfileKind) {
+
+    override fun parse(parameter: Parameter<PlayerProfile, Int>, sender: CommandSender, buffer: ArgumentBuffer): PlayerProfile? {
+        val info = parameter.paramInfo ?: REAL
+        val allowReal = (info and REAL) != 0
+        val allowFake = (info and FAKE) != 0
+
+        val input = buffer.next()!!
+
+        val profile = PlayerProfile.byName(input, allowReal, allowFake)
+
+        if (profile == null && (info and ProfileKind.ALLOW_INVALID) == 0) {
+            invalidInput(parameter, "\'$input\' is not a valid player name")
+        }
+
+        return profile
+    }
+
+    override fun complete(
+        parameter: Parameter<PlayerProfile, Int>,
+        sender: CommandSender,
+        location: Location?,
+        buffer: ArgumentBuffer
+    ): MutableList<String> {
+        logger.info("Completing PlayerProfile: ${buffer.next()}")
+        return super.complete(parameter, sender, location, buffer)
+    }
+}