1 files changed, 35 insertions, 24 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
index 6770d99..2116b46 100644
--- a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
+++ b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
@@ -6,6 +6,8 @@ import io.dico.parcels2.*
 import kotlinx.coroutines.experimental.Deferred
 import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.experimental.channels.SendChannel
+import kotlinx.coroutines.experimental.launch
 import java.util.UUID
 
 typealias DataPair = Pair<ParcelId, ParcelData?>
@@ -20,68 +22,77 @@ interface Storage {
     fun shutdown(): Job
 
 
+    fun getPlayerUuidForName(name: String): Deferred<UUID?>
+
     fun readParcelData(parcel: ParcelId): Deferred<ParcelData?>
 
-    fun readParcelData(parcels: Sequence<ParcelId>): ReceiveChannel<DataPair>
+    fun transmitParcelData(parcels: Sequence<ParcelId>): ReceiveChannel<DataPair>
 
-    fun readAllParcelData(): ReceiveChannel<DataPair>
+    fun transmitAllParcelData(): ReceiveChannel<DataPair>
 
-    fun getOwnedParcels(user: ParcelOwner): Deferred<List<ParcelId>>
+    fun getOwnedParcels(user: PlayerProfile): Deferred<List<ParcelId>>
 
-    fun getNumParcels(user: ParcelOwner): Deferred<Int>
+    fun getNumParcels(user: PlayerProfile): Deferred<Int>
 
 
     fun setParcelData(parcel: ParcelId, data: ParcelData?): Job
 
-    fun setParcelOwner(parcel: ParcelId, owner: ParcelOwner?): Job
+    fun setParcelOwner(parcel: ParcelId, owner: PlayerProfile?): Job
 
-    fun setParcelPlayerStatus(parcel: ParcelId, player: UUID, status: AddedStatus): Job
+    fun setParcelPlayerStatus(parcel: ParcelId, player: PlayerProfile, status: AddedStatus): Job
 
     fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean): Job
 
     fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean): Job
 
 
-    fun readAllGlobalAddedData(): ReceiveChannel<AddedDataPair<ParcelOwner>>
+    fun transmitAllGlobalAddedData(): ReceiveChannel<AddedDataPair<PlayerProfile>>
+
+    fun readGlobalAddedData(owner: PlayerProfile): Deferred<MutableAddedDataMap?>
+
+    fun setGlobalAddedStatus(owner: PlayerProfile, player: PlayerProfile, status: AddedStatus): Job
 
-    fun readGlobalAddedData(owner: ParcelOwner): Deferred<MutableAddedDataMap?>
 
-    fun setGlobalAddedStatus(owner: ParcelOwner, player: UUID, status: AddedStatus): Job
+    fun getChannelToUpdateParcelData(): SendChannel<Pair<ParcelId, ParcelData>>
 }
 
 class BackedStorage internal constructor(val b: Backing) : Storage {
     override val name get() = b.name
     override val isConnected get() = b.isConnected
 
-    override fun init() = b.launchJob { init() }
+    override fun init() = launch(b.dispatcher) { b.init() }
+
+    override fun shutdown() = launch(b.dispatcher) { b.shutdown() }
+
 
-    override fun shutdown() = b.launchJob { shutdown() }
+    override fun getPlayerUuidForName(name: String): Deferred<UUID?> = b.launchFuture { b.getPlayerUuidForName(name) }
 
+    override fun readParcelData(parcel: ParcelId) = b.launchFuture { b.readParcelData(parcel) }
 
-    override fun readParcelData(parcel: ParcelId) = b.launchFuture { readParcelData(parcel) }
+    override fun transmitParcelData(parcels: Sequence<ParcelId>) = b.openChannel<DataPair> { b.transmitParcelData(it, parcels) }
 
-    override fun readParcelData(parcels: Sequence<ParcelId>) = b.openChannel<DataPair> { produceParcelData(it, parcels) }
+    override fun transmitAllParcelData() = b.openChannel<DataPair> { b.transmitAllParcelData(it) }
 
-    override fun readAllParcelData() = b.openChannel<DataPair> { produceAllParcelData(it) }
+    override fun getOwnedParcels(user: PlayerProfile) = b.launchFuture { b.getOwnedParcels(user) }
 
-    override fun getOwnedParcels(user: ParcelOwner) = b.launchFuture { getOwnedParcels(user) }
+    override fun getNumParcels(user: PlayerProfile) = b.launchFuture { b.getNumParcels(user) }
 
-    override fun getNumParcels(user: ParcelOwner) = b.launchFuture { getNumParcels(user) }
+    override fun setParcelData(parcel: ParcelId, data: ParcelData?) = b.launchJob { b.setParcelData(parcel, data) }
 
-    override fun setParcelData(parcel: ParcelId, data: ParcelData?) = b.launchJob { setParcelData(parcel, data) }
+    override fun setParcelOwner(parcel: ParcelId, owner: PlayerProfile?) = b.launchJob { b.setParcelOwner(parcel, owner) }
 
-    override fun setParcelOwner(parcel: ParcelId, owner: ParcelOwner?) = b.launchJob { setParcelOwner(parcel, owner) }
+    override fun setParcelPlayerStatus(parcel: ParcelId, player: PlayerProfile, status: AddedStatus) = b.launchJob { b.setLocalPlayerStatus(parcel, player, status) }
 
-    override fun setParcelPlayerStatus(parcel: ParcelId, player: UUID, status: AddedStatus) = b.launchJob { setLocalPlayerStatus(parcel, player, status) }
+    override fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean) = b.launchJob { b.setParcelAllowsInteractInventory(parcel, value) }
 
-    override fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean) = b.launchJob { setParcelAllowsInteractInventory(parcel, value) }
+    override fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean) = b.launchJob { b.setParcelAllowsInteractInputs(parcel, value) }
 
-    override fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean) = b.launchJob { setParcelAllowsInteractInputs(parcel, value) }
 
+    override fun transmitAllGlobalAddedData(): ReceiveChannel<AddedDataPair<PlayerProfile>> = b.openChannel { b.transmitAllGlobalAddedData(it) }
 
-    override fun readAllGlobalAddedData(): ReceiveChannel<AddedDataPair<ParcelOwner>> = b.openChannel { produceAllGlobalAddedData(it) }
+    override fun readGlobalAddedData(owner: PlayerProfile): Deferred<MutableAddedDataMap?> = b.launchFuture { b.readGlobalAddedData(owner) }
 
-    override fun readGlobalAddedData(owner: ParcelOwner): Deferred<MutableAddedDataMap?> = b.launchFuture { readGlobalAddedData(owner) }
+    override fun setGlobalAddedStatus(owner: PlayerProfile, player: PlayerProfile, status: AddedStatus) = b.launchJob { b.setGlobalPlayerStatus(owner, player, status) }
 
-    override fun setGlobalAddedStatus(owner: ParcelOwner, player: UUID, status: AddedStatus) = b.launchJob { setGlobalPlayerStatus(owner, player, status) }
+    override fun getChannelToUpdateParcelData(): SendChannel<Pair<ParcelId, ParcelData>> = b.openChannelForWriting { b.setParcelData(it.first, it.second) }
 }