From 4263ac10318d3984fb0f7af1cbf7cb6f95267fa7 Mon Sep 17 00:00:00 2001 From: shynixn Date: Sun, 28 May 2023 13:20:35 +0200 Subject: [PATCH] #102 Fixed scheduler might not be loaded in 3.2.0-SNAPSHOT velocity builds. --- build.gradle | 2 +- docs/wiki/docs/installation.md | 28 +++++++++---------- docs/wiki/docs/unittests.md | 2 +- .../src/main/resources/plugin.yml | 2 +- .../src/main/resources/plugin.yml | 2 +- mccoroutine-fabric-sample/build.gradle.kts | 4 +-- .../src/main/resources/extension.json | 2 +- .../src/main/resources/mcmod.info | 2 +- .../velocity/impl/MCCoroutineImpl.kt | 4 ++- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index a102011f..43acd0b5 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ tasks.register("printVersion") { subprojects { group 'com.github.shynixn.mccoroutine' - version '2.12.0' + version '2.12.1' sourceCompatibility = 1.8 diff --git a/docs/wiki/docs/installation.md b/docs/wiki/docs/installation.md index 5b1556f8..6798153a 100644 --- a/docs/wiki/docs/installation.md +++ b/docs/wiki/docs/installation.md @@ -8,8 +8,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.12.1") } ``` @@ -17,8 +17,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.12.1") } ``` @@ -26,8 +26,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.12.1") } ``` @@ -35,8 +35,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.12.1") } ``` @@ -44,8 +44,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.12.1") } ``` @@ -53,8 +53,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li ```groovy dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.12.1") } ``` @@ -78,8 +78,8 @@ dependencies { **plugin.yml** ```yaml libraries: - - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.12.0 - - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.12.0 + - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.12.1 + - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.12.1 ``` === "Other Server" diff --git a/docs/wiki/docs/unittests.md b/docs/wiki/docs/unittests.md index 1a088b74..a1fae71c 100644 --- a/docs/wiki/docs/unittests.md +++ b/docs/wiki/docs/unittests.md @@ -18,7 +18,7 @@ feedback to the real environment. ```kotlin dependencies { - testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.12.0") + testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.12.1") } ``` diff --git a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml index f730982b..80730694 100644 --- a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml +++ b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: MCCoroutine-Sample -version: 2.12.0 +version: 2.12.1 author: Shynixn main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin commands: diff --git a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml index 4f1ce36a..453a3e9e 100644 --- a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml +++ b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: MCCoroutine-Sample -version: 2.12.0 +version: 2.12.1 author: Shynixn main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin commands: diff --git a/mccoroutine-fabric-sample/build.gradle.kts b/mccoroutine-fabric-sample/build.gradle.kts index ea4d40e7..2cac0140 100644 --- a/mccoroutine-fabric-sample/build.gradle.kts +++ b/mccoroutine-fabric-sample/build.gradle.kts @@ -9,8 +9,8 @@ repositories { mavenLocal() } dependencies { - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.12.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.12.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.12.1") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.12.1") minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String) mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2") diff --git a/mccoroutine-minestom-sample/src/main/resources/extension.json b/mccoroutine-minestom-sample/src/main/resources/extension.json index 57d9d982..5286e9a3 100644 --- a/mccoroutine-minestom-sample/src/main/resources/extension.json +++ b/mccoroutine-minestom-sample/src/main/resources/extension.json @@ -1,5 +1,5 @@ { "entrypoint": "com.github.shynixn.mccoroutine.minestom.sample.extension.MCCoroutineSampleExtension", "name": "MCCoroutineSampleExtension", - "version": "2.12.0" + "version": "2.12.1" } diff --git a/mccoroutine-sponge-sample/src/main/resources/mcmod.info b/mccoroutine-sponge-sample/src/main/resources/mcmod.info index a81381ca..68d5a380 100644 --- a/mccoroutine-sponge-sample/src/main/resources/mcmod.info +++ b/mccoroutine-sponge-sample/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [{ "modid": "mccoroutinesample", "name": "MCCoroutineSample", - "version": "2.12.0", + "version": "2.12.1", "description": "MCCoroutineSample is sample plugin to use MCCoroutine in Sponge.", "authorList": [ "Shynixn" diff --git a/mccoroutine-velocity-core/src/main/java/com/github/shynixn/mccoroutine/velocity/impl/MCCoroutineImpl.kt b/mccoroutine-velocity-core/src/main/java/com/github/shynixn/mccoroutine/velocity/impl/MCCoroutineImpl.kt index 859ab029..427401cc 100644 --- a/mccoroutine-velocity-core/src/main/java/com/github/shynixn/mccoroutine/velocity/impl/MCCoroutineImpl.kt +++ b/mccoroutine-velocity-core/src/main/java/com/github/shynixn/mccoroutine/velocity/impl/MCCoroutineImpl.kt @@ -4,6 +4,7 @@ import com.github.shynixn.mccoroutine.velocity.CoroutineSession import com.github.shynixn.mccoroutine.velocity.MCCoroutine import com.github.shynixn.mccoroutine.velocity.SuspendingPluginContainer import com.velocitypowered.api.plugin.PluginContainer +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.apache.logging.log4j.core.Logger @@ -49,7 +50,8 @@ class MCCoroutineImpl : MCCoroutine { // ReEnable logging. val session = getCoroutineSession(pluginInstance) val pluginManager = suspendingPluginContainer.server.pluginManager - session.scope.launch(session.dispatcherVelocity) { + // Scheduler might not be loaded yet. + session.scope.launch(Dispatchers.IO) { // Once the plugin is enabled, the filter is removed again to avoid any conflicts. while (!pluginManager.isLoaded(pluginContainer.description.id)) { delay(5000)