Improve database abstractions, add GlobalAddedData, some other things

1 files changed, 6 insertions, 8 deletions

diff --git a/src/main/kotlin/io/dico/parcels2/ParcelsPlugin.kt b/src/main/kotlin/io/dico/parcels2/ParcelsPlugin.kt
index 53a2d15..d55320e 100644
--- a/src/main/kotlin/io/dico/parcels2/ParcelsPlugin.kt
+++ b/src/main/kotlin/io/dico/parcels2/ParcelsPlugin.kt
@@ -10,7 +10,9 @@ import io.dico.parcels2.listener.ParcelEntityTracker
 import io.dico.parcels2.listener.ParcelListeners
 import io.dico.parcels2.storage.Storage
 import io.dico.parcels2.storage.yamlObjectMapper
+import io.dico.parcels2.util.FunctionHelper
 import io.dico.parcels2.util.tryCreate
+import kotlinx.coroutines.experimental.asCoroutineDispatcher
 import org.bukkit.Bukkit
 import org.bukkit.plugin.java.JavaPlugin
 import org.slf4j.LoggerFactory
@@ -25,20 +27,15 @@ class ParcelsPlugin : JavaPlugin() {
     lateinit var options: Options; private set
     lateinit var worlds: Worlds; private set
     lateinit var storage: Storage; private set
+    lateinit var globalAddedData: GlobalAddedDataManager; private set
 
     val registrator = Registrator(this)
     lateinit var entityTracker: ParcelEntityTracker; private set
     private var listeners: ParcelListeners? = null
     private var cmdDispatcher: ICommandDispatcher? = null
-    val worktimeLimiter: WorktimeLimiter by lazy { TickWorktimeLimiter(this, options.tickWorktime) }
 
-    val mainThreadDispatcher = object : Executor {
-        private val mainThread = Thread.currentThread()
-        override fun execute(command: Runnable) {
-            if (Thread.currentThread() === mainThread) command.run()
-            else server.scheduler.runTask(this@ParcelsPlugin, command)
-        }
-    }
+    val functionHelper: FunctionHelper = FunctionHelper(this)
+    val worktimeLimiter: WorktimeLimiter by lazy { TickWorktimeLimiter(this, options.tickWorktime) }
 
     override fun onEnable() {
         plogger.info("Debug enabled: ${plogger.isDebugEnabled}")
@@ -73,6 +70,7 @@ class ParcelsPlugin : JavaPlugin() {
             return false
         }
 
+        globalAddedData = GlobalAddedDataManagerImpl(this)
         entityTracker = ParcelEntityTracker(worlds)
         registerListeners()
         registerCommands()