Skip to content

Commit

Permalink
Merge pull request #119 from Shynixn/development
Browse files Browse the repository at this point in the history
Merge changes to master --release
  • Loading branch information
Shynixn authored Jul 5, 2024
2 parents 71d3aaf + ca5e27b commit 211dfb6
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks.register("printVersion") {

subprojects {
group 'com.github.shynixn.mccoroutine'
version '2.17.0'
version '2.18.0'

sourceCompatibility = 1.8

Expand Down
36 changes: 18 additions & 18 deletions docs/wiki/docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,62 @@ 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.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0")
}
```

=== "BungeeCord"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.18.0")
}
```

=== "Fabric"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")
}
```

=== "Folia"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0")
}
```

=== "Minestom"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.18.0")
}
```

=== "Sponge"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.18.0")
}
```

=== "Velocity"

```groovy
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.18.0")
}
```

Expand All @@ -87,17 +87,17 @@ dependencies {
**plugin.yml**
```yaml
libraries:
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.17.0
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.17.0
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0
- com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0
```

=== "Folia"

**plugin.yml**
```yaml
libraries:
- com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.17.0
- com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.17.0
- com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0
- com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0
```


Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/docs/unittests.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ feedback to the real environment.

```kotlin
dependencies {
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.17.0")
testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.18.0")
}
```

Expand Down
2 changes: 1 addition & 1 deletion mccoroutine-bukkit-sample/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MCCoroutine-Sample
version: 2.17.0
version: 2.18.0
author: Shynixn
main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin
commands:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MCCoroutine-Sample
version: 2.17.0
version: 2.18.0
author: Shynixn
main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin
commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.event.EventFactory
* A Fabric event which is called when an exception is raised in one of the coroutines managed by MCCoroutine.
* Cancelling this exception causes the error to not get logged and offers to possibility for custom logging.
*/
@FunctionalInterface
interface MCCoroutineExceptionEvent {
companion object {
val EVENT: Event<MCCoroutineExceptionEvent> =
Expand Down
4 changes: 2 additions & 2 deletions mccoroutine-fabric-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repositories {
mavenLocal()
}
dependencies {
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.17.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")

minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String)
mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2")
Expand Down
2 changes: 1 addition & 1 deletion mccoroutine-folia-sample/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MCCoroutine-Sample
version: 2.17.0
version: 2.18.0
author: Shynixn
main: com.github.shynixn.mccoroutine.folia.sample.MCCoroutineSamplePlugin
folia-supported: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"entrypoint": "com.github.shynixn.mccoroutine.minestom.sample.extension.MCCoroutineSampleExtension",
"name": "MCCoroutineSampleExtension",
"version": "2.17.0"
"version": "2.18.0"
}
2 changes: 1 addition & 1 deletion mccoroutine-sponge-sample/src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[{
"modid": "mccoroutinesample",
"name": "MCCoroutineSample",
"version": "2.17.0",
"version": "2.18.0",
"description": "MCCoroutineSample is sample plugin to use MCCoroutine in Sponge.",
"authorList": [
"Shynixn"
Expand Down

0 comments on commit 211dfb6

Please sign in to comment.