Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Refactor some stuff, make classes that really dont need to be sealed something else

Browse Source
This commit is contained in:
Dico
2018-08-26 19:52:41 +01:00
parent aa746d3872
commit baf99dc266
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/io/dico/parcels2/blockvisitor/WorktimeLimiter.kt
View File

@@ -17,22 +17,22 @@ typealias WorkerUpdateLister = Worker.(Double, Long) -> Unit
data class TickWorktimeOptions(var workTime: Int, var tickInterval: Int) data class TickWorktimeOptions(var workTime: Int, var tickInterval: Int)
sealed class WorktimeLimiter { interface WorktimeLimiter {
/** /**
* Submit a [task] that should be run synchronously, but limited such that it does not stall the server * Submit a [task] that should be run synchronously, but limited such that it does not stall the server
* a bunch * a bunch
*/ */
abstract fun submit(task: TimeLimitedTask): Worker fun submit(task: TimeLimitedTask): Worker
/** /**
* Get a list of all workers * Get a list of all workers
*/ */
abstract val workers: List<Worker> val workers: List<Worker>
/** /**
* Attempts to complete any remaining tasks immediately, without suspension. * Attempts to complete any remaining tasks immediately, without suspension.
*/ */
abstract fun completeAllTasks() fun completeAllTasks()
} }
interface Timed { interface Timed {
@@ -94,7 +94,7 @@ interface WorkerScope : Timed {
fun setProgress(progress: Double) fun setProgress(progress: Double)
} }
private interface WorkerContinuation : Worker, WorkerScope { interface WorkerInternal : Worker, WorkerScope {
/** /**
* Start or resumes the execution of this worker * Start or resumes the execution of this worker
* and returns true if the worker completed * and returns true if the worker completed
@@ -113,15 +113,15 @@ private interface WorkerContinuation : Worker, WorkerScope {
* There is a configurable maxiumum amount of milliseconds that can be allocated to all workers together in each server tick * There is a configurable maxiumum amount of milliseconds that can be allocated to all workers together in each server tick
* This object attempts to split that maximum amount of milliseconds equally between all jobs * This object attempts to split that maximum amount of milliseconds equally between all jobs
*/ */
class TickWorktimeLimiter(private val plugin: ParcelsPlugin, var options: TickWorktimeOptions) : WorktimeLimiter() { class TickWorktimeLimiter(private val plugin: ParcelsPlugin, var options: TickWorktimeOptions) : WorktimeLimiter {
// The currently registered bukkit scheduler task // The currently registered bukkit scheduler task
private var bukkitTask: BukkitTask? = null private var bukkitTask: BukkitTask? = null
// The workers. // The workers.
private val _workers = LinkedList<WorkerContinuation>() private val _workers = LinkedList<WorkerInternal>()
override val workers: List<Worker> = _workers override val workers: List<Worker> = _workers
override fun submit(task: TimeLimitedTask): Worker { override fun submit(task: TimeLimitedTask): Worker {
val worker: WorkerContinuation = WorkerImpl(plugin.functionHelper, task) val worker: WorkerInternal = WorkerImpl(plugin.functionHelper, task)
_workers.addFirst(worker) _workers.addFirst(worker)
if (bukkitTask == null) bukkitTask = plugin.functionHelper.scheduleRepeating(0, options.tickInterval) { tickJobs() } if (bukkitTask == null) bukkitTask = plugin.functionHelper.scheduleRepeating(0, options.tickInterval) { tickJobs() }
return worker return worker
@@ -166,7 +166,7 @@ class TickWorktimeLimiter(private val plugin: ParcelsPlugin, var options: TickWo
} }
private class WorkerImpl(val functionHelper: FunctionHelper, private class WorkerImpl(val functionHelper: FunctionHelper,
val task: TimeLimitedTask) : WorkerContinuation { val task: TimeLimitedTask) : WorkerInternal {
override var job: Job? = null; private set override var job: Job? = null; private set
override val elapsedTime override val elapsedTime

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

@@ -11,7 +11,7 @@ import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.statements.UpdateBuilder import org.jetbrains.exposed.sql.statements.UpdateBuilder
import java.util.UUID import java.util.UUID
sealed class IdTransactionsTable<TableT : IdTransactionsTable<TableT, QueryObj>, QueryObj>(tableName: String, columnName: String) abstract class IdTransactionsTable<TableT : IdTransactionsTable<TableT, QueryObj>, QueryObj>(tableName: String, columnName: String)
: Table(tableName) { : Table(tableName) {
val id = integer(columnName).autoIncrement().primaryKey() val id = integer(columnName).autoIncrement().primaryKey()