Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Work down some todo items, update to kotlin 1.3-rc

Browse Source
This commit is contained in:
Dico
2018-09-23 06:34:03 +01:00
parent f499555f8b
commit 038e698a14
46 changed files with 553 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/io/dico/parcels2/storage/Backing.kt
View File

@@ -1,11 +1,11 @@
package io.dico.parcels2.storage
import io.dico.parcels2.*
import kotlinx.coroutines.experimental.CoroutineDispatcher
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.CoroutineDispatcher
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Job
import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.channels.SendChannel
import org.joda.time.DateTime
import java.util.UUID

10
src/main/kotlin/io/dico/parcels2/storage/Storage.kt
View File

@@ -3,11 +3,11 @@
package io.dico.parcels2.storage
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 kotlinx.coroutines.Deferred
import kotlinx.coroutines.Job
import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.channels.SendChannel
import kotlinx.coroutines.launch
import org.joda.time.DateTime
import java.util.UUID

12
src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt
View File

@@ -8,14 +8,14 @@ import io.dico.parcels2.PlayerProfile.Star.name
import io.dico.parcels2.storage.AddedDataPair
import io.dico.parcels2.storage.Backing
import io.dico.parcels2.storage.DataPair
import io.dico.parcels2.util.synchronized
import io.dico.parcels2.util.ext.synchronized
import io.dico.parcels2.util.toByteArray
import io.dico.parcels2.util.toUUID
import kotlinx.coroutines.experimental.*
import kotlinx.coroutines.experimental.channels.ArrayChannel
import kotlinx.coroutines.experimental.channels.LinkedListChannel
import kotlinx.coroutines.experimental.channels.ReceiveChannel
import kotlinx.coroutines.experimental.channels.SendChannel
import kotlinx.coroutines.*
import kotlinx.coroutines.channels.ArrayChannel
import kotlinx.coroutines.channels.LinkedListChannel
import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.channels.SendChannel
import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SchemaUtils.create
import org.jetbrains.exposed.sql.transactions.transaction

7
src/main/kotlin/io/dico/parcels2/storage/exposed/IdTables.kt
View File

@@ -153,6 +153,13 @@ object ProfilesT : IdTransactionsTable<ProfilesT, PlayerProfile>("parcels_profil
return getItem(id) as? PlayerProfile.Real
}
/*
fun updatePlayerProfile(profile: PlayerProfile.Real) {
update({ uuid eq profile.uuid.toByteArray() }) {
it[name] = profile.nameOrBukkitName
}
}*/
}
// val ParcelsWithOptionsT = ParcelsT.join(ParcelOptionsT, JoinType.INNER, onColumn = ParcelsT.id, otherColumn = ParcelOptionsT.parcel_id)

2
src/main/kotlin/io/dico/parcels2/storage/exposed/ListTables.kt
View File

@@ -3,7 +3,7 @@
package io.dico.parcels2.storage.exposed
import io.dico.parcels2.*
import kotlinx.coroutines.experimental.channels.SendChannel
import kotlinx.coroutines.channels.SendChannel
import org.jetbrains.exposed.sql.*
import java.util.UUID

2
src/main/kotlin/io/dico/parcels2/storage/migration/Migration.kt
View File

@@ -1,7 +1,7 @@
package io.dico.parcels2.storage.migration
import io.dico.parcels2.storage.Storage
import kotlinx.coroutines.experimental.Job
import kotlinx.coroutines.Job
interface Migration {
fun migrateTo(storage: Storage): Job

6
src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt
View File

@@ -10,9 +10,9 @@ import io.dico.parcels2.storage.exposed.abs
import io.dico.parcels2.storage.exposed.greater
import io.dico.parcels2.storage.migration.Migration
import io.dico.parcels2.util.toUUID
import kotlinx.coroutines.experimental.Job
import kotlinx.coroutines.experimental.launch
import kotlinx.coroutines.experimental.newFixedThreadPoolContext
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.newFixedThreadPoolContext
import org.jetbrains.exposed.sql.*
import org.slf4j.LoggerFactory
import java.sql.Blob