Refactor and improve a lot of the API. Move default implementations into a package. Reformatting.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
index b5a1abf..de3cf64 100644
--- a/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/ParcelParameterTypes.kt
@@ -3,15 +3,10 @@ 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.ParcelProvider
 import io.dico.parcels2.ParcelWorld
-import io.dico.parcels2.ParcelsPlugin
-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
 
@@ -19,7 +14,7 @@ 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 {
+fun ParcelProvider.getTargetWorld(input: String?, sender: CommandSender, parameter: Parameter<*, *>): ParcelWorld {
     val worldName = input
         ?.takeUnless { it.isEmpty() }
         ?: (sender as? Player)?.world?.name
@@ -29,14 +24,14 @@ fun Worlds.getTargetWorld(input: String?, sender: CommandSender, parameter: Para
         ?: invalidInput(parameter, "$worldName is not a parcel world")
 }
 
-class ParcelParameterType(val worlds: Worlds) : ParameterType<Parcel, Void>(Parcel::class.java) {
+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 = worlds.getTargetWorld(matchResult.groupValues[2], sender, parameter)
+        val world = parcelProvider.getTargetWorld(matchResult.groupValues[2], sender, parameter)
 
         val x = matchResult.groupValues[3].toIntOrNull()
             ?: invalidInput(parameter, "couldn't parse int")
@@ -44,7 +39,7 @@ class ParcelParameterType(val worlds: Worlds) : ParameterType<Parcel, Void>(Parc
         val z = matchResult.groupValues[4].toIntOrNull()
             ?: invalidInput(parameter, "couldn't parse int")
 
-        return world.parcelByID(x, z)
+        return world.getParcelById(x, z)
             ?: invalidInput(parameter, "parcel id is out of range")
     }