diff --git a/build.gradle b/build.gradle index 06ee9ca2..66516fe9 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ tasks.register("printVersion") { subprojects { group 'com.github.shynixn.mccoroutine' - version '2.18.0' + version '2.19.0' sourceCompatibility = 1.8 diff --git a/docs/wiki/docs/installation.md b/docs/wiki/docs/installation.md index 593f3ffd..e4115705 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.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.19.0") } ``` @@ -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.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.19.0") } ``` @@ -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-fabric-api:2.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.19.0") } ``` @@ -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-folia-api:2.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.19.0") } ``` @@ -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.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.19.0") } ``` @@ -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-sponge-api:2.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.19.0") } ``` @@ -62,8 +62,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.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.19.0") } ``` @@ -87,8 +87,8 @@ dependencies { **plugin.yml** ```yaml libraries: - - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0 - - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0 + - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.19.0 + - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.19.0 ``` === "Folia" @@ -96,8 +96,8 @@ dependencies { **plugin.yml** ```yaml libraries: - - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0 - - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0 + - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.19.0 + - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.19.0 ``` diff --git a/docs/wiki/docs/unittests.md b/docs/wiki/docs/unittests.md index c63e7faa..72a04c43 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.18.0") + testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.19.0") } ``` diff --git a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml index 7d933430..91c1fa7c 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.18.0 +version: 2.19.0 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 d03e4a27..0717d1c9 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.18.0 +version: 2.19.0 author: Shynixn main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin commands: diff --git a/mccoroutine-fabric-core/src/test/java/integrationtest/FabricExceptionTest.kt b/mccoroutine-fabric-core/src/test/java/integrationtest/FabricExceptionTest.kt index c709c41c..d31271a7 100644 --- a/mccoroutine-fabric-core/src/test/java/integrationtest/FabricExceptionTest.kt +++ b/mccoroutine-fabric-core/src/test/java/integrationtest/FabricExceptionTest.kt @@ -60,6 +60,6 @@ class FabricExceptionTest { // Assert Assertions.assertNotEquals(ioThreadId, actualThreadId) - Assertions.assertEquals(1, logMessageCounter) // old value is 2 + Assertions.assertEquals(2, logMessageCounter) } } diff --git a/mccoroutine-fabric-sample/build.gradle.kts b/mccoroutine-fabric-sample/build.gradle.kts index 7b6a5e70..f576331d 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.18.0") - implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.19.0") + implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.19.0") 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-folia-sample/src/main/resources/plugin.yml b/mccoroutine-folia-sample/src/main/resources/plugin.yml index a6a1cb6b..9031b46a 100644 --- a/mccoroutine-folia-sample/src/main/resources/plugin.yml +++ b/mccoroutine-folia-sample/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: MCCoroutine-Sample -version: 2.18.0 +version: 2.19.0 author: Shynixn main: com.github.shynixn.mccoroutine.folia.sample.MCCoroutineSamplePlugin folia-supported: true diff --git a/mccoroutine-minestom-core/src/main/java/com/github/shynixn/mccoroutine/minestom/dispatcher/MinecraftCoroutineDispatcher.kt b/mccoroutine-minestom-core/src/main/java/com/github/shynixn/mccoroutine/minestom/dispatcher/MinecraftCoroutineDispatcher.kt index de3202e2..b4bedf4e 100644 --- a/mccoroutine-minestom-core/src/main/java/com/github/shynixn/mccoroutine/minestom/dispatcher/MinecraftCoroutineDispatcher.kt +++ b/mccoroutine-minestom-core/src/main/java/com/github/shynixn/mccoroutine/minestom/dispatcher/MinecraftCoroutineDispatcher.kt @@ -13,7 +13,7 @@ internal open class MinecraftCoroutineDispatcher : CoroutineDispatcher() { init { MinecraftServer.getSchedulerManager().scheduleNextProcess { - mainThreadId = Thread.currentThread().threadId() + mainThreadId = Thread.currentThread().id } } @@ -24,7 +24,7 @@ internal open class MinecraftCoroutineDispatcher : CoroutineDispatcher() { * may leave the coroutines that use this dispatcher in the inconsistent and hard to debug state. */ override fun isDispatchNeeded(context: CoroutineContext): Boolean { - return Thread.currentThread().threadId() != mainThreadId + return Thread.currentThread().id != mainThreadId } /** diff --git a/mccoroutine-minestom-sample/build.gradle.kts b/mccoroutine-minestom-sample/build.gradle.kts index 5121c704..0844d2a4 100644 --- a/mccoroutine-minestom-sample/build.gradle.kts +++ b/mccoroutine-minestom-sample/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { tasks.withType { duplicatesStrategy = DuplicatesStrategy.EXCLUDE manifest { - attributes["Main-Class"] = "com.github.shynixn.mccoroutine.minestom.sample.MCoroutineSampleServerKt" + attributes["Main-Class"] = "com.github.shynixn.mccoroutine.minestom.sample.server.MCoroutineSampleServerKt" } } @@ -48,5 +48,5 @@ tasks.withType { archiveFileName.set("${archiveBaseName.get()}-${archiveVersion.get()}.${archiveExtension.get()}") // Change the output folder of the plugin. - // destinationDir = File("..\\extensions") + // destinationDirectory.set(File("C:\\temp\\minestom")) } diff --git a/mccoroutine-minestom-sample/src/main/resources/extension.json b/mccoroutine-minestom-sample/src/main/resources/extension.json index d124643d..6acd162a 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.18.0" + "version": "2.19.0" } diff --git a/mccoroutine-sponge-sample/src/main/resources/mcmod.info b/mccoroutine-sponge-sample/src/main/resources/mcmod.info index 7447ff8a..e1cd2728 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.18.0", + "version": "2.19.0", "description": "MCCoroutineSample is sample plugin to use MCCoroutine in Sponge.", "authorList": [ "Shynixn"