From 751cc30c6a6981942cc39583f9b51ba5072703ba Mon Sep 17 00:00:00 2001 From: Dico Date: Mon, 24 Sep 2018 04:40:32 +0100 Subject: Refactor final occurrences of status -> privilege --- src/main/kotlin/io/dico/parcels2/PlayerProfile.kt | 2 +- src/main/kotlin/io/dico/parcels2/storage/Backing.kt | 8 ++------ src/main/kotlin/io/dico/parcels2/storage/Storage.kt | 4 ++-- .../io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/io/dico/parcels2/PlayerProfile.kt b/src/main/kotlin/io/dico/parcels2/PlayerProfile.kt index 0ef9f9d..c430340 100644 --- a/src/main/kotlin/io/dico/parcels2/PlayerProfile.kt +++ b/src/main/kotlin/io/dico/parcels2/PlayerProfile.kt @@ -185,7 +185,7 @@ interface PlayerProfile { * An existing player * A fake player (with only a name) * An existing player who must have its uuid resolved from the database (after checking against Bukkit OfflinePlayer) - * STAR profile, which matches everyone. This profile is considered a REAL player, because it can have an added status. + * STAR profile, which matches everyone. This profile is considered a REAL player, because it can have a privilege. */ class PlayerProfile2 private constructor(uuid: UUID?, val name: String?, diff --git a/src/main/kotlin/io/dico/parcels2/storage/Backing.kt b/src/main/kotlin/io/dico/parcels2/storage/Backing.kt index 69c5b62..6f71471 100644 --- a/src/main/kotlin/io/dico/parcels2/storage/Backing.kt +++ b/src/main/kotlin/io/dico/parcels2/storage/Backing.kt @@ -56,18 +56,14 @@ interface Backing { fun setParcelOwnerSignOutdated(parcel: ParcelId, outdated: Boolean) - fun setLocalPrivilege(parcel: ParcelId, player: PlayerProfile, status: Privilege) + fun setLocalPrivilege(parcel: ParcelId, player: PlayerProfile, privilege: Privilege) fun setParcelOptionsInteractConfig(parcel: ParcelId, config: InteractableConfiguration) -/* - fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean) - fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean) -*/ fun transmitAllGlobalAddedData(channel: SendChannel>) fun readGlobalPrivileges(owner: PlayerProfile): MutablePrivilegeMap - fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege) + fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege) } diff --git a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt index fa63496..334d010 100644 --- a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt +++ b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt @@ -59,7 +59,7 @@ interface Storage { fun readGlobalPrivileges(owner: PlayerProfile): Deferred - fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege): Job + fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege): Job fun getChannelToUpdateParcelData(): SendChannel> @@ -108,7 +108,7 @@ class BackedStorage internal constructor(val b: Backing) : Storage, CoroutineSco override fun readGlobalPrivileges(owner: PlayerProfile): Deferred = b.launchFuture { b.readGlobalPrivileges(owner) } - override fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege) = b.launchJob { b.setGlobalPrivilege(owner, player, status) } + override fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege) = b.launchJob { b.setGlobalPrivilege(owner, player, privilege) } override fun getChannelToUpdateParcelData(): SendChannel> = b.openChannelForWriting { b.setParcelData(it.first, it.second) } } diff --git a/src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt b/src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt index b514f87..a79d315 100644 --- a/src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt +++ b/src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt @@ -69,7 +69,7 @@ class PlotmeMigration(val options: PlotmeMigrationOptions) : Migration { fun PlotmePlotPlayerMap.transmitPlotmeAddedTable(kind: Privilege) { selectAll().forEach { row -> val parcel = getParcelId(this, row) ?: return@forEach - val profile = StatusKey.safe(row[player_uuid]?.toUUID(), row[player_name]) ?: return@forEach + val profile = PrivilegeKey.safe(row[player_uuid]?.toUUID(), row[player_name]) ?: return@forEach target.setLocalPrivilege(parcel, profile, kind) } } -- cgit v1.2.3