Missed some merge conflicts T-T

Author: Forbidden-A

dforblock-hytale/src/main/kotlin/dev/forb/dforblock/hytale/DForBlockHytalePlugin.kt

@@ -45,7 +45,7 @@ class DForBlockHytalePlugin(init: JavaPluginInit) : JavaPlugin(init) {
             private set
     }
 
-    var dForBlockOrchestrator: DForBlock? = null
+    var dForBlockOrchestrator: DForBlockOrchestrator? = null
         private set
     var communicator: IBlockyCommunicator? = null
         private set
@@ -81,7 +81,7 @@ class DForBlockHytalePlugin(init: JavaPluginInit) : JavaPlugin(init) {
             configManager = configManager!!,
         )
 
-        dForBlockOrchestrator = DForBlock(
+        dForBlockOrchestrator = DForBlockOrchestrator(
             configManager ?: run {
                 hytaleLogger.at(Level.SEVERE)
                     .log("Unexpected state, 'configManager is null' while creating dforBlock...")

dforblock-papermc/src/main/kotlin/dev/forb/dforblock/papermc/PaperCommunicator.kt

@@ -13,7 +13,7 @@ import kotlin.coroutines.resume
 
 class PaperCommunicator(
     override val configDir: Path,
-    override val isLuckperms: Boolean,
+    override val isLuckperms: () -> Boolean,
     val plugin: DForBlockPaper
 ) : IBlockyCommunicator {
     override fun stopServer() = plugin.server.shutdown()
@@ -53,7 +53,7 @@ class PaperCommunicator(
         val channelName =
             plugin.configManager?.channels?.entries?.firstOrNull { (_, v) -> v.channelId == payload.channelId }?.key
                 ?: return
-        val kyoriComponent = prepareMinecraftMiniMessage(payload, channelName, template)
+        val kyoriComponent = prepareMiniMessage(payload, channelName, template)
         plugin.server.sendMessage(kyoriComponent)
     }