1 files changed, 24 insertions, 153 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/Parcel.kt b/src/main/kotlin/io/dico/parcels2/Parcel.kt
index e86667b..a69116a 100644
--- a/src/main/kotlin/io/dico/parcels2/Parcel.kt
+++ b/src/main/kotlin/io/dico/parcels2/Parcel.kt
@@ -1,52 +1,11 @@
 package io.dico.parcels2
 
 import io.dico.parcels2.util.Vec2i
-import io.dico.parcels2.util.getPlayerName
 import io.dico.parcels2.util.hasBuildAnywhere
-import io.dico.parcels2.util.isValid
-import io.dico.parcels2.util.uuid
-import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.joda.time.DateTime
-import java.util.*
-
-interface AddedData {
-    val added: Map<UUID, AddedStatus>
-
-    fun getAddedStatus(uuid: UUID): AddedStatus
-    fun setAddedStatus(uuid: UUID, status: AddedStatus): Boolean
-    
-    fun compareAndSetAddedStatus(uuid: UUID, expect: AddedStatus, status: AddedStatus): Boolean =
-        (getAddedStatus(uuid) == expect).also { if (it) setAddedStatus(uuid, status) }
-    
-    fun isAllowed(uuid: UUID) = getAddedStatus(uuid) == AddedStatus.ALLOWED
-    fun allow(uuid: UUID) = setAddedStatus(uuid, AddedStatus.ALLOWED)
-    fun disallow(uuid: UUID) = compareAndSetAddedStatus(uuid, AddedStatus.ALLOWED, AddedStatus.DEFAULT)
-    fun isBanned(uuid: UUID) = getAddedStatus(uuid) == AddedStatus.BANNED
-    fun ban(uuid: UUID) = setAddedStatus(uuid, AddedStatus.BANNED)
-    fun unban(uuid: UUID) = compareAndSetAddedStatus(uuid, AddedStatus.BANNED, AddedStatus.DEFAULT)
-
-    fun isAllowed(player: OfflinePlayer) = isAllowed(player.uuid)
-    fun allow(player: OfflinePlayer) = allow(player.uuid)
-    fun disallow(player: OfflinePlayer) = disallow(player.uuid)
-    fun isBanned(player: OfflinePlayer) = isBanned(player.uuid)
-    fun ban(player: OfflinePlayer) = ban(player.uuid)
-    fun unban(player: OfflinePlayer) = unban(player.uuid)
-}
-
-interface ParcelData : AddedData {
-    var owner: ParcelOwner?
-
-    fun canBuild(player: OfflinePlayer, checkAdmin: Boolean = true, checkGlobal: Boolean = true): Boolean
-
-    var allowInteractInputs: Boolean
-    var allowInteractInventory: Boolean
-
-    fun isOwner(uuid: UUID): Boolean {
-        return owner?.uuid == uuid
-    }
-}
+import java.util.UUID
 
 /**
  * Parcel implementation of ParcelData will update the database when changes are made.
@@ -56,77 +15,41 @@ interface ParcelData : AddedData {
  * However, this implementation is intentionally not thread-safe.
  * Therefore, database query callbacks should schedule their updates using the bukkit scheduler.
  */
-class Parcel(val world: ParcelWorld, val pos: Vec2i) : ParcelData {
-    val id get() = "${pos.x}:${pos.z}"
-    val homeLocation get() = world.generator.getHomeLocation(this)
-    private var blockVisitors = 0
-
+interface Parcel : ParcelData {
+    val id: ParcelId
+    val world: ParcelWorld
+    val pos: Vec2i
+    val x: Int
+    val z: Int
+    val data: ParcelData
     val infoString: String
-        get() {
-            return "$id; owned by ${owner?.let { it.name ?: Bukkit.getOfflinePlayer(it.uuid).name }}"
-        }
-
-    var data: ParcelData = ParcelDataHolder(); private set
+    val hasBlockVisitors: Boolean
 
-    fun copyDataIgnoringDatabase(data: ParcelData) {
-        this.data = data
-    }
-
-    fun copyData(data: ParcelData) {
-        world.storage.setParcelData(this, data)
-        this.data = data
-    }
+    fun copyDataIgnoringDatabase(data: ParcelData)
 
-    override val added: Map<UUID, AddedStatus> get() = data.added
-    override fun getAddedStatus(uuid: UUID) = data.getAddedStatus(uuid)
-    override fun isBanned(uuid: UUID) = data.isBanned(uuid)
-    override fun isAllowed(uuid: UUID) = data.isAllowed(uuid)
-    override fun canBuild(player: OfflinePlayer, checkAdmin: Boolean, checkGlobal: Boolean) = data.canBuild(player)
+    fun copyData(data: ParcelData)
 
-    override var owner: ParcelOwner?
-        get() = data.owner
-        set(value) {
-            if (data.owner != value) {
-                world.storage.setParcelOwner(this, value)
-                data.owner = value
-            }
-        }
-
-    override fun setAddedStatus(uuid: UUID, status: AddedStatus): Boolean {
-        return data.setAddedStatus(uuid, status).also {
-            if (it) world.storage.setParcelPlayerState(this, uuid, status.asBoolean)
-        }
-    }
+    fun dispose()
+}
 
-    override var allowInteractInputs: Boolean
-        get() = data.allowInteractInputs
-        set(value) {
-            if (data.allowInteractInputs == value) return
-            world.storage.setParcelAllowsInteractInputs(this, value)
-            data.allowInteractInputs = value
-        }
+interface ParcelData : AddedData {
+    var owner: ParcelOwner?
+    val since: DateTime?
 
-    override var allowInteractInventory: Boolean
-        get() = data.allowInteractInventory
-        set(value) {
-            if (data.allowInteractInventory == value) return
-            world.storage.setParcelAllowsInteractInventory(this, value)
-            data.allowInteractInventory = value
-        }
+    fun canBuild(player: OfflinePlayer, checkAdmin: Boolean = true, checkGlobal: Boolean = true): Boolean
 
-    var hasBlockVisitors: Boolean = false; private set
-}
+    var allowInteractInputs: Boolean
+    var allowInteractInventory: Boolean
 
-open class AddedDataHolder : AddedData {
-    override var added = mutableMapOf<UUID, AddedStatus>()
-    override fun getAddedStatus(uuid: UUID): AddedStatus = added.getOrDefault(uuid, AddedStatus.DEFAULT)
-    override fun setAddedStatus(uuid: UUID, status: AddedStatus): Boolean = status.takeIf { it != AddedStatus.DEFAULT }
-        ?.let { added.put(uuid, it) != it }
-        ?: added.remove(uuid) != null
+    fun isOwner(uuid: UUID): Boolean {
+        return owner?.uuid == uuid
+    }
 }
 
 class ParcelDataHolder : AddedDataHolder(), ParcelData {
+
     override var owner: ParcelOwner? = null
+    override var since: DateTime? = null
     override fun canBuild(player: OfflinePlayer, checkAdmin: Boolean, checkGlobal: Boolean) = isAllowed(player.uniqueId)
         || owner.let { it != null && it.matches(player, allowNameMatch = false) }
         || (checkAdmin && player is Player && player.hasBuildAnywhere)
@@ -135,55 +58,3 @@ class ParcelDataHolder : AddedDataHolder(), ParcelData {
     override var allowInteractInventory = true
 }
 
-enum class AddedStatus {
-    DEFAULT,
-    ALLOWED,
-    BANNED;
-
-    val asBoolean
-        get() = when (this) {
-            DEFAULT -> null
-            ALLOWED -> true
-            BANNED -> false
-        }
-}
-
-@Suppress("UsePropertyAccessSyntax")
-class ParcelOwner(val uuid: UUID? = null,
-                  name: String? = null,
-                  val since: DateTime? = null) {
-
-    companion object {
-        fun create(uuid: UUID?, name: String?, time: DateTime? = null): ParcelOwner? {
-            return uuid?.let { ParcelOwner(uuid, name, time) }
-                ?: name?.let { ParcelOwner(uuid, name, time) }
-        }
-    }
-
-    val name: String?
-
-    init {
-        uuid ?: name ?: throw IllegalArgumentException("uuid and/or name must be present")
-
-        if (name != null) this.name = name
-        else {
-            val offlinePlayer = Bukkit.getOfflinePlayer(uuid).takeIf { it.isValid }
-            this.name = offlinePlayer?.name
-        }
-    }
-
-    val playerName get() = getPlayerName(uuid, name)
-
-    fun matches(player: OfflinePlayer, allowNameMatch: Boolean = false): Boolean {
-        return uuid?.let { it == player.uniqueId } ?: false
-            || (allowNameMatch && name?.let { it == player.name } ?: false)
-    }
-
-    val onlinePlayer: Player? get() = uuid?.let { Bukkit.getPlayer(uuid) }
-    val onlinePlayerAllowingNameMatch: Player? get() = onlinePlayer ?: name?.let { Bukkit.getPlayer(name) }
-
-    @Suppress("DEPRECATION")
-    val offlinePlayer
-        get() = (uuid?.let { Bukkit.getOfflinePlayer(it) } ?: Bukkit.getOfflinePlayer(name))
-            ?.takeIf { it.isValid }
-}